主程序
This commit is contained in:
parent
7378b05852
commit
b5c7dc5775
@ -0,0 +1,50 @@
|
||||
package com.czlis.common.core.domain.entity.lis;
|
||||
|
||||
|
||||
import com.czlis.common.core.domain.BaseEntity;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class LabPatBk {
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date jyrq;
|
||||
private String yq;
|
||||
private String ybh;
|
||||
private String yblx;
|
||||
private String fb;
|
||||
private String ksdh;
|
||||
private String sjys;
|
||||
private String hdys;
|
||||
private String yhdh;
|
||||
private String brdh;
|
||||
private String brxm;
|
||||
private String brxb;
|
||||
private String brly;
|
||||
private String ch;
|
||||
private Integer nl;
|
||||
private String nldw;
|
||||
private String sqh;
|
||||
private Date sqsj;
|
||||
private Date dysj;
|
||||
private String dybz;
|
||||
private String jgbz;
|
||||
private String bbbz;
|
||||
private String zd;
|
||||
private String bz;
|
||||
private String bz1;
|
||||
private String zjf;
|
||||
private Date cyrq;
|
||||
private String bq;
|
||||
private String czybh;
|
||||
private String cjbw;
|
||||
private String jymd;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package com.czlis.common.core.domain.entity.lis;
|
||||
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
import java.util.Date;
|
||||
@Data
|
||||
@AllArgsConstructor
|
||||
@NoArgsConstructor
|
||||
public class LabResultBk {
|
||||
|
||||
@JsonFormat(pattern = "yyyy-MM-dd")
|
||||
private Date jyrq;
|
||||
private String yq;
|
||||
private String ybh;
|
||||
private String xmdh;
|
||||
private String csjg;
|
||||
private String od;
|
||||
private String cutoff;
|
||||
private String jgbz;
|
||||
private String bz1;
|
||||
private String bz2;
|
||||
private String yhdh;
|
||||
|
||||
|
||||
}
|
||||
@ -174,8 +174,8 @@ public class CommonUtil {
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int updateLabPatJgbz(Date jyrq, String yq, String ybh,String jgbz){return updateLabPatByColumn(jyrq,yq,ybh,"jgbz",jgbz);}
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public int updateLabPatByColumn(Date jyrq, String yq, String ybh,String column,String jgbz){
|
||||
return labPatMapper.updateLabPatByColumn(jyrq,yq,ybh,column,jgbz);}
|
||||
public int updateLabPatByColumn(Date jyrq, String yq, String ybh,String column,String value){
|
||||
return labPatMapper.updateLabPatByColumn(jyrq,yq,ybh,column,value);}
|
||||
|
||||
public int getCountByKey(Date jyrq, String yq, String ybh) {
|
||||
return labPatMapper.getCountByKey(jyrq, yq, ybh);
|
||||
|
||||
@ -139,10 +139,30 @@ public class LisWorkController extends BaseController {
|
||||
public Result datalink(Date jyrq, String yq) {
|
||||
return lisWorkService.datalink(jyrq,yq);
|
||||
}
|
||||
@ApiOperation("更改流水线状态")
|
||||
@GetMapping("/changelink")
|
||||
public Result changelink(Date jyrq, String yq, String ybh,String instrid) {
|
||||
return lisWorkService.changelink(jyrq,yq,ybh,instrid);
|
||||
}
|
||||
@ApiOperation("批量更改流水线状态")
|
||||
@PostMapping("/changelinklist")
|
||||
public Result changelinklist(@RequestBody List<LabPat> labPatList) {
|
||||
if(labPatList.isEmpty()) return new Result("-1","无数据");
|
||||
for(LabPat labPat : labPatList) {
|
||||
lisWorkService.changelink(labPat.getJyrq(),labPat.getYq(),labPat.getYbh(),labPat.getInstrid());
|
||||
}
|
||||
return new Result("0","成功");
|
||||
}
|
||||
|
||||
@ApiOperation("清除所有未做项目")
|
||||
@GetMapping("/clearnotcomplete")
|
||||
public Result clearnotcomplete(Date jyrq, String yq,String ybh) {
|
||||
return lisWorkService.clearnotcomplete(jyrq,yq,ybh);
|
||||
}
|
||||
@ApiOperation("查看备份数据")
|
||||
@GetMapping("/viewbackup")
|
||||
public Result viewbackup(Date jyrq, String yq,String ybh) {
|
||||
return lisWorkService.viewbackup(jyrq,yq,ybh);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,11 +1,7 @@
|
||||
package com.czlis.liswork.mapper;
|
||||
|
||||
import com.czlis.common.core.domain.entity.*;
|
||||
import com.czlis.common.core.domain.entity.lis.ComOpt;
|
||||
import com.czlis.common.core.domain.entity.lis.LabPat;
|
||||
import com.czlis.common.core.domain.entity.lis.LabResult;
|
||||
import com.czlis.common.core.domain.entity.lis.LabResultMed;
|
||||
import com.czlis.common.core.domain.entity.lis.LabPatInfo;
|
||||
import com.czlis.common.core.domain.entity.lis.*;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.Date;
|
||||
@ -24,4 +20,6 @@ public interface LisWorkMapper {
|
||||
List<LabPatInfo> getLabPatInfo(LabPatInfo labPatInfo);
|
||||
List<LabResultMed> getLabResultMedInfo(LabResultMed labResultMed);
|
||||
SysUser getSysUser(String userName);
|
||||
LabPatBk getLabPatBk(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh);
|
||||
List<LabResultBk> getLabResultBk(@Param("jyrq") Date jyrq, @Param("yq") String yq, @Param("ybh")String ybh);
|
||||
}
|
||||
|
||||
@ -26,5 +26,8 @@ public interface LisWorkService {
|
||||
Result allpatquery(Date jyrq, String yq, String ybh);
|
||||
Result emrquery(Date jyrq, String yq, String ybh);
|
||||
Result datalink(Date jyrq, String yq);
|
||||
Result changelink(Date jyrq, String yq,String ybh,String instrid);
|
||||
Result clearnotcomplete(Date jyrq, String yq,String ybh);
|
||||
Result viewbackup(Date jyrq, String yq,String ybh);
|
||||
|
||||
}
|
||||
|
||||
@ -1,21 +1,17 @@
|
||||
package com.czlis.liswork.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import com.czlis.common.core.domain.Result;
|
||||
import com.czlis.common.core.domain.entity.*;
|
||||
import com.czlis.common.core.domain.entity.lis.*;
|
||||
import com.czlis.common.enums.UserStatus;
|
||||
import com.czlis.common.exception.ServiceException;
|
||||
import com.czlis.common.utils.DateUtils;
|
||||
import com.czlis.common.utils.MessageUtils;
|
||||
import com.czlis.common.utils.SecurityUtils;
|
||||
import com.czlis.common.utils.StringUtils;
|
||||
import com.czlis.common.utils.ip.IpUtils;
|
||||
import com.czlis.interfaceCommon.constants.ComLogConstants;
|
||||
import com.czlis.interfaceCommon.constants.LabReqmainConstants;
|
||||
import com.czlis.interfaceCommon.constants.LisinterfaceNameConstants;
|
||||
import com.czlis.interfaceCommon.pojo.entity.LastLabPatParam;
|
||||
import com.czlis.interfaceCommon.pojo.inter.DayMessage;
|
||||
import com.czlis.interfaceCommon.utils.*;
|
||||
import com.czlis.liswork.mapper.LisWorkMapper;
|
||||
|
||||
@ -31,8 +27,6 @@ import java.util.stream.Collectors;
|
||||
@Service
|
||||
@Slf4j
|
||||
public class LisWorkServiceImpl implements LisWorkService {
|
||||
@Autowired
|
||||
LisInterfaceUtil lisInterfaceUtil;
|
||||
@Autowired
|
||||
LisWorkMapper lisWorkMapper;
|
||||
@Autowired
|
||||
@ -611,6 +605,11 @@ public class LisWorkServiceImpl implements LisWorkService {
|
||||
return new Result("0", "成功!",labPatlist0);
|
||||
}
|
||||
@Override
|
||||
public Result changelink(Date jyrq, String yq,String ybh,String instrid) {
|
||||
commonUtil.updateLabPatByColumn(jyrq, yq, ybh,"instrid",instrid);
|
||||
return new Result("0", "成功!");
|
||||
}
|
||||
@Override
|
||||
public Result clearnotcomplete(Date jyrq, String yq,String ybh){
|
||||
LabResult labResult=new LabResult();
|
||||
labResult.setJyrq(jyrq);
|
||||
@ -620,4 +619,13 @@ public class LisWorkServiceImpl implements LisWorkService {
|
||||
commonUtil.delLabResult(labResult);
|
||||
return new Result("0", "成功!");
|
||||
}
|
||||
@Override
|
||||
public Result viewbackup(Date jyrq, String yq,String ybh){
|
||||
Map<String,Object> map=new HashMap<>();
|
||||
LabPatBk labPatBk=lisWorkMapper.getLabPatBk(jyrq, yq, ybh);
|
||||
map.put("labpatbk",labPatBk);
|
||||
List<LabResultBk> labResultBklist=lisWorkMapper.getLabResultBk(jyrq, yq, ybh);
|
||||
map.put("labresultbk", labResultBklist);
|
||||
return new Result("0", "成功!",map);
|
||||
}
|
||||
}
|
||||
|
||||
@ -120,5 +120,16 @@
|
||||
select * from sys_user
|
||||
where user_name = #{userName} and del_flag = '0'
|
||||
</select>
|
||||
|
||||
<select id="getLabPatBk" resultType="com.czlis.common.core.domain.entity.lis.LabPatBk">
|
||||
select * from lab_pat_bk
|
||||
where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
|
||||
</select>
|
||||
<select id="getLabResultBk" resultType="com.czlis.common.core.domain.entity.lis.LabResultBk">
|
||||
select * from lab_result_bk
|
||||
where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
|
||||
</select>
|
||||
<select id="getLabResultBk" resultType="com.czlis.common.core.domain.entity.lis.LabResultBk">
|
||||
select * from lab_result_bk
|
||||
where jyrq = #{jyrq} and yq = #{yq} and ybh = #{ybh}
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user