义乌质控规则修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/dutyshiftsystem/DUT0296.java

@@ -9,11 +9,7 @@ import com.lantone.qc.pub.model.doc.transferrecord.TransferRecordDoc;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @ClassName : DUT0296
@@ -104,6 +100,10 @@ public class DUT0296 extends QCCatalogue {
         int lengthOfStayNum = 0;
         String lengthOfStay = structureMap_leave.get("住院天数");
         if (StringUtil.isNotBlank(lengthOfStay)) {
+            String num = lengthOfStay.replaceAll("[^0-9]", "");
+            if (StringUtil.isBlank(num)) {
+                return 0;
+            }
             lengthOfStayNum = onlyNum(lengthOfStay);
         }
         return lengthOfStayNum;
@@ -191,11 +191,11 @@ public class DUT0296 extends QCCatalogue {
             from.setTime(dateIn);
             Calendar to = Calendar.getInstance();
             to.setTime(dateOut);
-            long timeS,timeE,timeDiff = 0;
+            long timeS, timeE, timeDiff = 0;
             try {
                 timeS = from.getTimeInMillis();
                 timeE = to.getTimeInMillis();
-                timeDiff = (timeE - timeS) / (1000 * 60* 60 * 24);
+                timeDiff = (timeE - timeS) / (1000 * 60 * 60 * 24);
             } catch (Exception e) {
                 e.printStackTrace();
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/firstcourserecord/FIRC0092.java

@@ -51,9 +51,9 @@ public class FIRC0092 extends QCCatalogue {
             return;
         }
         String message = "";
-        if (treatPlanLabel.getNursingLevel() == null || treatPlanLabel.getNursingLevel().getName().contains("护理常规")) {
-            message += "无护理级别;";
-        }
+//        if (treatPlanLabel.getNursingLevel() == null || treatPlanLabel.getNursingLevel().getName().contains("护理常规")) {
+//            message += "无护理级别;";
+//        }
 
         if (ListUtil.isEmpty(treatPlanLabel.getPacs())) {
             message += "无化验或辅检;";

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/leavehospital/LEA02987.java

@@ -71,6 +71,7 @@ public class LEA02987 extends QCCatalogue {
             String type = adviceDocStructureMap.get("医嘱类型判别");
             if (StringUtil.isNotBlank(type) && type.equals("出院带药")) {
                 if (StringUtil.isNotBlank(name)) {
+                    name = name.replaceAll("[^\u4e00-\u9fa5]", "");
                     drugs.add(name);
                 }
             }

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuLeaveHospitalDocTrans.java

@@ -33,7 +33,7 @@ public class YiWuLeaveHospitalDocTrans extends ModelDocTrans {
             structureMap = (Map) FastJsonUtils.getJsonToMap(content);
         } else {
             Map<String, String> sourceMap = YiWuXmlUtil.xmlToMap(content);
-            List<String> titles = Lists.newArrayList("入院时间", "出院时间", "住院天数", "入院诊断", "出院诊断", "出院诊断"
+            List<String> titles = Lists.newArrayList("入院时间", "出院时间", "住院数", "住院天数", "入院诊断", "出院诊断", "出院诊断"
                     , "入院情况", "住院经过", "出院情况", "出院医嘱", "医师签名", "签名时间", "主诉", "诊疗过程", "医师签名时间");
             String text = sourceMap.get("原始文本");
             List<String> sortTitles = CommonAnalysisUtil.sortTitles(titles, text);