diff --git a/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLog.java b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLog.java new file mode 100644 index 0000000..af2f611 --- /dev/null +++ b/lis-common/src/main/java/com/czlis/common/core/domain/entity/lis/ComLog.java @@ -0,0 +1,26 @@ +package com.czlis.common.core.domain.entity.lis; + + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ComLog { + + private String yq; + private Date rzdt; + private String rzbz; + private String yhdh; + private String rznr; + private String dnmc; + private String bz; + private Date jyrq; + private String ybh; + + + +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComLogMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComLogMapper.java new file mode 100644 index 0000000..eccbcdf --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComLogMapper.java @@ -0,0 +1,8 @@ +package com.czlis.interfaceCommon.mapper; + +import com.czlis.common.core.domain.entity.lis.ComLog; +import java.util.List; +public interface ComLogMapper { + List getComLog(ComLog comLog); + int insertComLog(ComLog comLog); +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java index 72612b0..bde6f96 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CommonUtil.java @@ -50,6 +50,8 @@ public class CommonUtil { LabReqreportPdffileMapper labReqreportPdffileMapper; @Autowired LabReqsteplogMapper labReqsteplogMapper; + @Autowired + ComLogMapper comLogMapper; //====检验主表操作方法集合=== public LabPat getLabPatOne(Date jyrq, String yq, String ybh) { @@ -173,8 +175,8 @@ public class CommonUtil { public List getXmAlarmdetail(String yq, String xmdh) { return xmAlarmdetailMapper.getXmAlarmdetail(yq, xmdh); } + public Integer insertComLog(ComLog comLog) {return comLogMapper.insertComLog(comLog);} - ; public String getYqmc(String yq) { return labInstrMapper.getYqmc(yq); diff --git a/lis-interfaceCommon/src/main/resources/mapper/ComLogMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/ComLogMapper.xml new file mode 100644 index 0000000..6503313 --- /dev/null +++ b/lis-interfaceCommon/src/main/resources/mapper/ComLogMapper.xml @@ -0,0 +1,42 @@ + + + + + + + insert into com_log(yq,rzdt, + rzbz, + yhdh, + rznr, + dnmc, + bz, + jyrq, + ybh + )values(#{yq},#{rzdt}, + #{rzbz}, + #{yhdh}, + #{rznr}, + #{dnmc}, + #{bz}, + #{jyrq}, + #{ybh} + ) + + \ No newline at end of file diff --git a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java index 9d2f2ee..80498c8 100644 --- a/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java +++ b/liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java @@ -234,7 +234,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { //5:数据状态修改,异步上传接口作业创建 Result result1 = afterconfirm(labPat, problemId); if (!"0".equals(result1.getCode())) return result1; - return new Result("0", "保存成功！"); + return new Result("3", "审核成功！"); } /** @@ -258,7 +258,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { String ybh = labPat.getYbh(); if (labPat == null) return new Result("-1", "病人信息为空禁止审核！"); String jgbz = labPat.getJgbz(); - if ("2".equals(jgbz)) new Result("0", "保存成功！"); + if ("2".equals(jgbz)) return new Result("1", "报告已审核！"); if ("5".equals(jgbz)) return new Result("-1", "已锁定报告禁止审核！"); if (!"1".equals(jgbz)) { String f_check1 = commonUtil.getComOptValue(yq, "f_check1"); @@ -387,9 +387,9 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { String yq = labPat.getYq(); String ybh = labPat.getYbh(); String hdys = labPat.getHdys(); + String yqdl = commonUtil.getYqdl(yq); String itemvs = commonUtil.getHISOPT("itemvs"); if ("1".equals(itemvs)) { - String yqdl = commonUtil.getYqdl(yq); if (!"细菌仪".equals(yqdl)) { String nullcount = lisWorkOperMapper.checkresultnosqxmdh(jyrq, yq, ybh); if (!"".equals(nullcount) && nullcount != null) @@ -441,7 +441,13 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { } if (!result.getCode().equals("0")) return result; //最后完成 + String finish=labPat.getFinish(); + if (!"细菌仪".equals(yqdl) && finish !=null) labPat.setFinish("1"); labPat.setJgbz(ReportStatusConstants.CONFIRM); + Integer shcs=labPat.getShcs(); + if(shcs==null)shcs=0; + shcs=shcs+1; + labPat.setShcs(shcs); commonUtil.updateLabPat(labPat); return new Result("0", "保存成功！"); } @@ -543,8 +549,26 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { * @return */ public Result saveallresult(Date jyrq, String yq, String ybh) { + int finsh=1; + List labResultList = commonUtil.getLabResultList(jyrq, yq, ybh); + if (labResultList == null || labResultList.size() == 0) return new Result("-1", "结果为空！"); + for (LabResult labResult : labResultList) { + String csjg = labResult.getCsjg(); + if ("未做".equals(csjg)) { + finsh=0; + } + if (csjg != null) { + if (csjg.contains("ERR")) finsh=0; + if (csjg.contains("需稀释")) finsh=0; + if (csjg.contains("需复做")) finsh=0; + + } + } + String yqdl = commonUtil.getYqdl(yq); //查询病人信息 LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh); + String finish=labPat.getFinish(); + if (!"细菌仪".equals(yqdl) && finish !=null && finsh==1) labPat.setFinish("1"); int wjz = saveallresult(labPat); //同步主表危急值标识 String alarmflag = labPat.getAlarmflag(); @@ -572,6 +596,12 @@ public class LisWorkOperServiceImpl implements LisWorkOperService { calcsample(labPat); //保存最新参考值结果标志 int wjz = saverefs(labPat); + String alarmflag = labPat.getAlarmflag(); + if (("1".equals(alarmflag) && wjz != 1)) { + labPat.setAlarmflag("1"); + } else if (("".equals(alarmflag) || alarmflag == null) && wjz == 1) { + labPat.setAlarmflag(""); + } //补写结果表申请单项目编号 String sqh = labPat.getSqh(); if (sqh != null && !"".equals(sqh)) setItemSqxmdh(jyrq, yq, ybh, sqh);