Просмотр исходного кода

台州运行质控出院小结修改bug

hujing 5 лет назад
Родитель
Сommit
b260906e6c

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0150.java

@@ -24,7 +24,7 @@ public class LEA0150 extends QCCatalogue {
             return;
         }
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() != null) {
+        if (deathRecordDoc != null) {
             status.set("0");
         } else {
             String message = leaveHospitalDoc.getStructureMap().get("入院情况");

+ 3 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0151.java

@@ -24,11 +24,11 @@ public class LEA0151 extends QCCatalogue {
             return;
         }
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() != null) {
+        if (deathRecordDoc != null) {
             status.set("0");
         } else {
-            String text = leaveHospitalDoc.getBeHospitalizedLabel().getText();
-            if (!StringUtils.isBlank(text)) {
+            String message = leaveHospitalDoc.getStructureMap().get("入院诊断");
+            if (!StringUtils.isBlank(message)) {
                 status.set("0");
             }
         }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0152.java

@@ -24,7 +24,7 @@ public class LEA0152 extends QCCatalogue {
             return;
         }
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() != null) {
+        if (deathRecordDoc != null) {
             status.set("0");
         } else {
             String message = leaveHospitalDoc.getStructureMap().get("诊治经过");

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0153.java

@@ -23,7 +23,7 @@ public class LEA0153 extends QCCatalogue {
             return;
         }
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() != null) {
+        if (deathRecordDoc != null) {
             status.set("0");
         } else {
             String message = leaveHospitalDoc.getStructureMap().get("出院情况");

+ 16 - 12
kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0154.java

@@ -6,13 +6,14 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.DeathRecordDoc;
 import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.model.label.DiagLabel;
+import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
 /**
- * @Description: 出院记录内容缺出院(死亡)诊断
+ * @Description: 出院记录内容缺出院(死亡)诊断 出院记录内容缺出院诊断
  * @author: rengb
  * @time: 2020/3/10 13:53
  */
@@ -21,22 +22,25 @@ public class LEA0154 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status.set("0");
         LeaveHospitalDoc leaveHospitalDoc = inputInfo.getLeaveHospitalDoc();
         if (leaveHospitalDoc == null) {
+            status.set("0");
             return;
         }
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() == null) {
-            Map<String, String> structureMap = leaveHospitalDoc.getStructureMap();
-            if(StringUtils.isNotEmpty(structureMap.get("出院诊断"))){
-                return;
-            }
-            DiagLabel leaveDiagLabel = leaveHospitalDoc.getLeaveDiagLabel();
-            if (leaveDiagLabel != null) {
-                if (StringUtils.isBlank(leaveDiagLabel.getText())) {
-                    status.set("-1");
-                }
+        if (deathRecordDoc != null) {
+            status.set("0");
+            return;
+        }
+        Map<String, String> structureMap = leaveHospitalDoc.getStructureMap();
+        if (StringUtils.isNotEmpty(structureMap.get("出院诊断"))) {
+            status.set("0");
+            return;
+        }
+        DiagLabel leaveDiagLabel = leaveHospitalDoc.getLeaveDiagLabel();
+        if (leaveDiagLabel != null) {
+            if (StringUtil.isNotBlank(leaveDiagLabel.getText())) {
+                status.set("0");
             }
         }
     }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0396.java

@@ -24,7 +24,7 @@ public class LEA0396 extends QCCatalogue {
             return;
         }
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() == null) {
+        if (deathRecordDoc != null) {
             status.set("0");
         } else {
             String time = leaveHospitalDoc.getStructureMap().get("出院时间");