Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/beilun_dev_20210607' into beilun/dev

wangsy 4 rokov pred
rodič
commit
433eb7eb85
16 zmenil súbory, kde vykonal 288 pridanie a 17 odobranie
  1. 5 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0009.java
  2. 6 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0015.java
  3. 6 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0016.java
  4. 5 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0017.java
  5. 6 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0019.java
  6. 6 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0020.java
  7. 6 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0021.java
  8. 15 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0079.java
  9. 6 1
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0448.java
  10. 14 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0560.java
  11. 54 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BHE0988.java
  12. 45 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BHE0989.java
  13. 10 4
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/firstpagerecord/FIRP0195.java
  14. 49 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/medicalwriting/MEDI0998.java
  15. 50 0
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/medicalwriting/MEDI0999.java
  16. 5 5
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/threelevelward/THR0601.java

+ 5 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0009.java

@@ -35,7 +35,11 @@ public class BEH0009 extends QCCatalogue {
         //修改该规则只适用于神经内科
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
         Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
-        if(!Content.neurology.equals(structureMap.get("behDeptName"))){
+        String behDeptName = structureMap.get("behDeptName");
+        if(StringUtil.isEmpty(behDeptName)){
+            return;
+        }
+        if(!Content.neurology.equals(behDeptName)){
             return;
         }
         ChiefLabel chiefLabel = inputInfo.getBeHospitalizedDoc().getChiefLabel();

+ 6 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0015.java

@@ -9,6 +9,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
 import com.lantone.qc.pub.model.entity.BodyPart;
 import com.lantone.qc.pub.model.entity.Clinical;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -34,7 +35,11 @@ public class BEH0015 extends QCCatalogue {
         //修改该规则只适用于神经内科
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
         Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
-        if(!Content.neurology.equals(structureMap.get("behDeptName"))){
+        String behDeptName = structureMap.get("behDeptName");
+        if(StringUtil.isEmpty(behDeptName)){
+            return;
+        }
+        if(!Content.neurology.equals(behDeptName)){
             return;
         }
         List<String> clinicalList = (List<String>) specialStorageUtil.getJsonStringValue(KernelConstants.CONCEPT_CLINIC_BODYPART_PROPERTIES_LIST);

+ 6 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0016.java

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
 import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.Property;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -30,7 +31,11 @@ public class BEH0016 extends QCCatalogue {
         //修改该规则只适用于神经内科
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
         Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
-        if(!Content.neurology.equals(structureMap.get("behDeptName"))){
+        String behDeptName = structureMap.get("behDeptName");
+        if(StringUtil.isEmpty(behDeptName)){
+            return;
+        }
+        if(!Content.neurology.equals(behDeptName)){
             return;
         }
         List<Clinical> clinicals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getClinicals();

+ 5 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0017.java

@@ -32,7 +32,11 @@ public class BEH0017 extends QCCatalogue {
         //修改该规则只适用于神经内科
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
         Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
-        if(!Content.neurology.equals(structureMap.get("behDeptName"))){
+        String behDeptName = structureMap.get("behDeptName");
+        if(StringUtil.isEmpty(behDeptName)){
+            return;
+        }
+        if(!Content.neurology.equals(behDeptName)){
             return;
         }
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();

+ 6 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0019.java

@@ -8,6 +8,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
 import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.Degree;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -34,7 +35,11 @@ public class BEH0019 extends QCCatalogue {
         //修改该规则只适用于神经内科
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
         Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
-        if(!Content.neurology.equals(structureMap.get("behDeptName"))){
+        String behDeptName = structureMap.get("behDeptName");
+        if(StringUtil.isEmpty(behDeptName)){
+            return;
+        }
+        if(!Content.neurology.equals(behDeptName)){
             return;
         }
         List<Clinical> clinicals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getClinicals();

+ 6 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0020.java

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
 import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.Modification;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -30,7 +31,11 @@ public class BEH0020 extends QCCatalogue {
         //修改该规则只适用于神经内科
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
         Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
-        if(!Content.neurology.equals(structureMap.get("behDeptName"))){
+        String behDeptName = structureMap.get("behDeptName");
+        if(StringUtil.isEmpty(behDeptName)){
+            return;
+        }
+        if(!Content.neurology.equals(behDeptName)){
             return;
         }
         List<Clinical> clinicals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getClinicals();

+ 6 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0021.java

@@ -9,6 +9,7 @@ import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.General;
 import com.lantone.qc.pub.model.entity.GeneralDesc;
 import com.lantone.qc.pub.model.entity.Modification;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -32,7 +33,11 @@ public class BEH0021 extends QCCatalogue {
         //修改该规则只适用于神经内科
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
         Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
-        if(!Content.neurology.equals(structureMap.get("behDeptName"))){
+        String behDeptName = structureMap.get("behDeptName");
+        if(StringUtil.isEmpty(behDeptName)){
+            return;
+        }
+        if(!Content.neurology.equals(behDeptName)){
             return;
         }
         List<General> gens = inputInfo.getBeHospitalizedDoc().getPresentLabel().getGens();

+ 15 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0079.java

@@ -2,10 +2,15 @@ package com.lantone.qc.kernel.catalogue.hangzhoudiqi.behospitalized;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * @ClassName : BEH0079
  * @Description : 专科检查未填写
@@ -20,6 +25,16 @@ public class BEH0079 extends QCCatalogue {
             status.set("0");
             return;
         }
+        //修改该规则只适用于神经内科
+        MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
+        Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
+        String behDeptName = structureMap.get("behDeptName");
+        if(StringUtil.isEmpty(behDeptName)){
+            return;
+        }
+        if(!Content.neurology.equals(behDeptName)){
+            return;
+        }
         if (inputInfo.getBeHospitalizedDoc().getVitalLabelSpecial() != null) {
             if (!CatalogueUtil.isEmpty(inputInfo.getBeHospitalizedDoc().getVitalLabelSpecial().getText())) {
                 status.set("0");

+ 6 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0448.java

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
 import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
 import com.lantone.qc.pub.model.entity.Clinical;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -29,7 +30,11 @@ public class BEH0448 extends QCCatalogue {
         //修改该规则只适用于神经内科
         MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
         Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
-        if(!Content.neurology.equals(structureMap.get("behDeptName"))){
+        String behDeptName = structureMap.get("behDeptName");
+        if(StringUtil.isEmpty(behDeptName)){
+            return;
+        }
+        if(!Content.neurology.equals(behDeptName)){
             return;
         }
         BeHospitalizedDoc beHospitalizedDoc = inputInfo.getBeHospitalizedDoc();

+ 14 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BEH0560.java

@@ -1,14 +1,18 @@
 package com.lantone.qc.kernel.catalogue.hangzhoudiqi.behospitalized;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
+import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
 import com.lantone.qc.pub.model.entity.Clinical;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -25,6 +29,16 @@ public class BEH0560 extends QCCatalogue {
         if (beHospitalizedDoc == null || beHospitalizedDoc.getChiefLabel() == null) {
             return;
         }
+        //修改该规则只适用于神经内科
+        MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
+        Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
+        String behDeptName = structureMap.get("behDeptName");
+        if(StringUtil.isEmpty(behDeptName)){
+            return;
+        }
+        if(!Content.neurology.equals(behDeptName)){
+            return;
+        }
         String chiefTxt = beHospitalizedDoc.getChiefLabel().getText();
         if (chiefTxt.contains("检查") || chiefTxt.contains("术后") || chiefTxt.contains("药物") || chiefTxt.contains("发现")) {
             status.set("0");

+ 54 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BHE0988.java

@@ -0,0 +1,54 @@
+package com.lantone.qc.kernel.catalogue.hangzhoudiqi.behospitalized;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
+import com.lantone.qc.pub.model.entity.Clinical;
+import com.lantone.qc.pub.model.entity.PD;
+import com.lantone.qc.pub.model.label.PresentLabel;
+import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName : BHE0988
+ * @Description :  现病史症状缺少持续时间
+ * @Author : 楼辉荣
+ * @Date: 2020-03-06 17:28
+ */
+@Component
+public class BHE0988 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (inputInfo.getBeHospitalizedDoc() == null) {
+            status.set("0");
+            return;
+        }
+        //修改该规则只适用于神经内科
+        MedicalRecordInfoDoc medicalRecordInfoDoc = inputInfo.getMedicalRecordInfoDoc();
+        Map<String, String> structureMap = medicalRecordInfoDoc.getStructureMap();
+        if(!Content.neurology.equals(structureMap.get("behDeptName"))){
+            return;
+        }
+        PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
+        if (presentLabel == null) {
+            status.set("0");
+            return;
+        }
+        //暂取主述中时间
+        List<Clinical> clinicals = presentLabel.getClinicals();
+        if (clinicals.size() > 0) {
+            for (Clinical clinical : clinicals) {
+                List<PD> timestamp = clinical.getTimestamp();
+                if (ListUtil.isNotEmpty(timestamp)) {
+                    status.set("0");
+                    return;
+                }
+            }
+        }
+    }
+}

+ 45 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/behospitalized/BHE0989.java

@@ -0,0 +1,45 @@
+package com.lantone.qc.kernel.catalogue.hangzhoudiqi.behospitalized;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.BeHospitalizedDoc;
+import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @ClassName : BHE0989
+ * @Description :  入院记录身份号填写与病案首页不一致
+ * @Author : 楼辉荣
+ * @Date: 2020-03-06 17:28
+ */
+@Component
+public class BHE0989 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        if (inputInfo.getBeHospitalizedDoc() == null) {
+            status.set("0");
+            return;
+        }
+        String idNumber = inputInfo.getBeHospitalizedDoc().getStructureMap().get(Content.idNumber);
+        //入院记录存在身份证号
+        if(StringUtil.isEmpty(idNumber)){
+            status.set("0");
+            return;
+        }
+        //病案首页不存在
+        if(inputInfo.getFirstPageRecordDoc()==null){
+            status.set("-1");
+            return;
+        }
+        //首页身份证号
+        String FirIdNumber = inputInfo.getFirstPageRecordDoc().getStructureMap().get(Content.idNumber);
+        if(idNumber.equals(FirIdNumber)){
+            status.set("0");
+            return;
+        }
+    }
+}

+ 10 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/firstpagerecord/FIRP0195.java

@@ -40,15 +40,21 @@ public class FIRP0195 extends QCCatalogue {
             wardOutWay = "死亡";
             if (!match(outWay, wardOutWay)) {
                 status.set("-1");
+                return;
             }
             //增加判断,如有死亡记录,开医嘱离院需扣分
             List<DoctorAdviceDoc> doctorAdviceDocs = inputInfo.getDoctorAdviceDocs();
             if(doctorAdviceDocs!=null) {
-                Map<String, String> structureMap = deathCaseDiscussDoc.getStructureMap();
-                String name = structureMap.get(Content.medicalName);
-                if(name.contains("出院")){
-                    status.set("-1");
+                for (DoctorAdviceDoc doctorAdviceDoc : doctorAdviceDocs) {
+                    String name = doctorAdviceDoc.getStructureMap().get(Content.medicalName);
+                    if(StringUtil.isNotEmpty(name)) {
+                        if (name.contains("出院")) {
+                            status.set("-1");
+                            return;
+                        }
+                    }
                 }
+
             }
         }
 

+ 49 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/medicalwriting/MEDI0998.java

@@ -0,0 +1,49 @@
+package com.lantone.qc.kernel.catalogue.hangzhoudiqi.medicalwriting;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @ClassName : MEDI0999
+ * @Description :病重患者无病重通知单
+ * @Author : 楼辉荣
+ * @Date: 2020-03-28 17:32
+ */
+@Component
+public class MEDI0998 extends QCCatalogue {
+    @Override
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        boolean flag =false;
+        //无医嘱
+        if(inputInfo.getDoctorAdviceDocs()==null){
+            status.set("0");
+            return;
+        }
+        //医嘱为病危患者
+        List<DoctorAdviceDoc> doctorAdviceDocs = inputInfo.getDoctorAdviceDocs();
+        for (DoctorAdviceDoc doctorAdviceDoc : doctorAdviceDocs) {
+            String medicalName = doctorAdviceDoc.getStructureMap().get(Content.medicalName);
+            if(StringUtil.isNotEmpty(medicalName)){
+                if(medicalName.contains("病重")){
+                    status.set("-1");
+                    flag=true;
+                }
+            }
+        }
+        //看是否含有病重通知书
+        if(flag){
+            if(inputInfo.getSeriouslyIllNoticeDocs()!=null){
+                status.set("0");
+                return;
+            }
+
+        }
+    }
+}

+ 50 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/medicalwriting/MEDI0999.java

@@ -0,0 +1,50 @@
+package com.lantone.qc.kernel.catalogue.hangzhoudiqi.medicalwriting;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.Content;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.doc.DoctorAdviceDoc;
+import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.util.List;
+
+/**
+ * @ClassName : MEDI0999
+ * @Description :病危患者无病重通知单
+ * @Author : 楼辉荣
+ * @Date: 2020-03-28 17:32
+ */
+@Component
+public class MEDI0999 extends QCCatalogue {
+    @Override
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        boolean flag =false;
+        //无医嘱
+        if(inputInfo.getDoctorAdviceDocs()==null){
+            status.set("0");
+            return;
+        }
+        //医嘱为病危患者
+        List<DoctorAdviceDoc> doctorAdviceDocs = inputInfo.getDoctorAdviceDocs();
+        for (DoctorAdviceDoc doctorAdviceDoc : doctorAdviceDocs) {
+            String medicalName = doctorAdviceDoc.getStructureMap().get(Content.medicalName);
+            if(StringUtil.isNotEmpty(medicalName)){
+                if(medicalName.contains("病危")){
+                    status.set("-1");
+                    flag=true;
+                }
+            }
+        }
+        //看是否含有病危通知书
+        if(flag){
+            if(inputInfo.getCriticallyIllNoticeDocs()!=null){
+                status.set("0");
+                return;
+            }
+
+        }
+    }
+}

+ 5 - 5
kernel/src/main/java/com/lantone/qc/kernel/catalogue/hangzhoudiqi/threelevelward/THR0601.java

@@ -41,12 +41,12 @@ public class THR0601 extends QCCatalogue {
             if (!CatalogueUtil.compareTime(
                     StringUtil.parseDateTime(admisTime),
                     StringUtil.parseDateTime(DateUtil.nowString()),
-                    Long.valueOf(48 * 60))) {//如果入院未超过48小时,规则不判断
+                    Long.valueOf(24 * 60))) {//如果入院未超过24小时,规则不判断
                 return;
             }
-            //如果住院天数小于2天则不判断该条规则
+            //如果住院天数小于1天则不判断该条规则
             if (DateUtil.parseDate(dischargeTime) != null &&
-                    !CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(dischargeTime), (long) (48 * 60))) {
+                    !CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(dischargeTime), (long) (24 * 60))) {
                 return;
             } else {
                 if (inputInfo.getThreeLevelWardDocs().size() == 0) {
@@ -60,8 +60,8 @@ public class THR0601 extends QCCatalogue {
             Map<String, String> leaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
             String lengthOfStay = leaveHospitalStructureMap.get("住院天数");
             if (StringUtil.isNotBlank(lengthOfStay) && CatalogueUtil.numbersOnly(lengthOfStay)) {
-                //如果住院天数小于2天则不判断该条规则
-                if (Integer.parseInt(lengthOfStay) <= 2) {
+                //如果住院天数小于1天则不判断该条规则
+                if (Integer.parseInt(lengthOfStay) <= 1) {
                     return;
                 }
             }