主业务添加代码

lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/CheckResultUtils.java

@@ -21,6 +21,7 @@ public class CheckResultUtils {
     LabCheckrulesMapper labCheckrulesMapper;
     @Autowired
     CommonUtil commonUtil = new CommonUtil();
+
     public String chksample(LabPat labPat, List<LabResult> labResultList) {
         String errmsg = "";
         String brdh = labPat.getBrdh();
@@ -129,6 +130,7 @@ public class CheckResultUtils {
 
     /**
      * 自动审核时,询问默认失败,填备注默认每次都填
+     *
      * @param labPat
      * @param labResultList
      * @return
@@ -145,6 +147,7 @@ public class CheckResultUtils {
 
     /**
      * 高级审核,对于重复询问通过xh递归询问
+     *
      * @param labPat
      * @param labResultList
      * @param xh
@@ -198,6 +201,7 @@ public class CheckResultUtils {
 
     /**
      * 计算公式注入参数执行,返回为真则证明筛选条件成立,需要禁止审核通过!
+     *
      * @param labPat
      * @param labResultList
      * @param checkrules
@@ -331,6 +335,7 @@ public class CheckResultUtils {
 
     /**
      * 备注信息公式转换备注内容
+     *
      * @param labPat
      * @param labResultList
      * @param logcontent
@@ -383,9 +388,9 @@ public class CheckResultUtils {
             }
         }
         String bz = labPat.getBz();
-        if(errmsg!=null && !"".equals(errmsg))
+        if (errmsg == null || "".equals(errmsg)) return bz;
-        if(bz==null||"".equals(bz)) bz=errmsg;
+        if (bz == null || "".equals(bz)) return errmsg;
-        else {
+        if (bz.contains(errmsg)) return bz;
         String bz0 = String.valueOf(bz.charAt(bz.length() - 1));
         switch (bz0) {
             case ",":
@@ -401,7 +406,7 @@ public class CheckResultUtils {
                 break;
             default:
                 bz = bz + "," + errmsg;
-        }}
+        }
         return bz;
     }
 

liswork/src/main/java/com/czlis/liswork/service/impl/LisWorkOperServiceImpl.java

@@ -51,6 +51,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
     LabReqdetailMapper labReqdetailMapper;
     @Autowired
     CheckResultUtils checkResultUtils;
+
     @Override
     public Result newPatInfo(Date jyrq, String ybh, String sqh, String yq, Long userId) {
 
@@ -220,7 +221,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         //2:数据合法性校验
         LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
         labPat.setHdys(hdys);
-        Result result = beforeconfirm(labPat, problemId);
+        Result result = beforeconfirm(labPat, 2, problemId);
         if (!"0".equals(result.getCode())) return result;
         //3:数据完整保存
         int wjz = saveallresult(labPat);
@@ -262,11 +263,11 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
     public Result beforeconfirm(Date jyrq, String yq, String ybh) {
         int problemId = ServletUtils.getParameterToInt("problemId", 0);
         LabPat labPat = commonUtil.getLabPatOne(jyrq, yq, ybh);
-        return beforeconfirm(labPat, problemId);
+        return beforeconfirm(labPat, 2, problemId);
     }
 
     //内部使用
-    private Result beforeconfirm(LabPat labPat, Integer problemId) {
+    private Result beforeconfirm(LabPat labPat, Integer checktype, Integer problemId) {
         Date jyrq = labPat.getJyrq();
         String yq = labPat.getYq();
         String ybh = labPat.getYbh();
@@ -274,11 +275,13 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         String jgbz = labPat.getJgbz();
         if ("2".equals(jgbz)) return new Result("1", "报告已审核！");
         if ("5".equals(jgbz)) return new Result("-1", "已锁定报告禁止审核！");
-        if (!"1".equals(jgbz)) {
+        if (!"1".equals(jgbz) && checktype == 2) {
             String f_check1 = commonUtil.getComOptValue(yq, "f_check1");
             if ("1".equals(f_check1)) return new Result("-1", "审核前必须先初审！");
         }
+        if (checktype == 2) {
             if (checkWorkTime(labPat) == 1) return new Result("-1", "核对医生不允许与检验医生相同！");
+        }
         String limit_brly = commonUtil.getHISOPT("limit_brly");
         String brly = labPat.getBrly();
         if ("1".equals(limit_brly) && (brly == null || "".equals(brly)))
@@ -362,7 +365,8 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         if (Userid == null || "".equals(Userid)) {
             Userid = SecurityUtils.getLoginUser().getUsername();
         }
-
+        //初审不需要调用接口
+        if (checktype == 1) return new Result("0", "保存成功！");
         //调用his报告接口，检查外部接口对审核前的定制需求
         SetReport setReport = new SetReport();
         setReport.setIp(IpUtils.getIpAddr());
@@ -408,6 +412,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
 
     /**
      * 医学审核条件判断
+     *
      * @param labPat
      * @param problemId
      * @return
@@ -449,6 +454,7 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         }
         return new Result("0", "保存成功！");
     }
+
     /**
      * 审核后步骤,在审核过程中,必须完成审核前校验通过,结果计算值填充,参考值结果标志危急值标志填写完成,最后使用此方法修改状态
      *