Merge remote-tracking branch 'origin/master'

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

@@ -152,8 +152,6 @@ public class CheckResultUtils {
      */
     public Map<String, Object> chksamplenew(LabPat labPat, List<LabResult> labResultList,int xh){
         String yq = labPat.getYq();
-        Date jyrq = labPat.getJyrq();
-        String ybh = labPat.getYbh();
         String bz= labPat.getBz();
         Map<String, Object> params = new HashMap<>();
         params.put("code", "0");

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

@@ -228,8 +228,10 @@ public class LisWorkOperServiceImpl implements LisWorkOperService {
         String alarmflag = labPat.getAlarmflag();
         if (("1".equals(alarmflag) && wjz != 1)) {
             labPat.setAlarmflag("1");
+            commonUtil.updateLabPat(labPat);
         } else if (("".equals(alarmflag) || alarmflag == null) && wjz == 1) {
             labPat.setAlarmflag("");
+            commonUtil.updateLabPat(labPat);
         }
         //医学审核条件判断
         if(problemId<4)problemId=4;