Merge remote-tracking branch 'origin/dev-1.2' into dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0375.java

@@ -56,15 +56,21 @@ public class BEH0375 extends QCCatalogue {
             return;
         }
         List<Family> familyList = Lists.newArrayList();
-        List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
-        List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();
-        if (ListUtil.isNotEmpty(familiesFl)) {
-            familyList.addAll(familiesFl);
+        if (inputInfo.getBeHospitalizedDoc().getFamilyLabel() != null){
+            List<Family> familiesFl = inputInfo.getBeHospitalizedDoc().getFamilyLabel().getFamilies();
+            if (ListUtil.isNotEmpty(familiesFl)) {
+                familyList.addAll(familiesFl);
+            }
         }
-        if (ListUtil.isNotEmpty(familiesMl)) {
-            familyList.addAll(familiesMl);
+
+        if (inputInfo.getBeHospitalizedDoc().getMaritalLabel() != null){
+            List<Family> familiesMl = inputInfo.getBeHospitalizedDoc().getMaritalLabel().getFamily();
+            if (ListUtil.isNotEmpty(familiesMl)) {
+                familyList.addAll(familiesMl);
+            }
         }
 
+
         Pattern p = Pattern.compile("[配偶]");
         List<Family> filterFamilies = familyList
                 .stream()

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0087.java

@@ -42,22 +42,25 @@ public class FIRC0087 extends QCCatalogue {
 //                List<Diag> diags = differentialDiagLabel.getDiags();
                 String diag = initDiagLabel.getDiags().get(0).getHospitalDiagName();
                 String casechar = casecharLabel.getText();
-                String chief = casechar.substring(casechar.indexOf("主诉")+2, casechar.indexOf("现病史"));
-                String present = casechar.substring(casechar.indexOf("现病史")+3, casechar.indexOf("既往史"));
+                String chief = "";
+                String present = "";
+                if (casechar.contains("主诉") && casechar.contains("现病史")) {
+                    chief = casechar.substring(casechar.indexOf("主诉") + 2, casechar.indexOf("现病史"));
+                    present = casechar.substring(casechar.indexOf("现病史") + 3, casechar.indexOf("既往史"));
+                }
 
-                if (StringUtils.isNotEmpty(differentialDiagLabel.getText())
-                    && (differentialDiagLabel.getText().contains("诊断明确")
-                        || differentialDiagLabel.getText().contains("无需鉴别"))) {
-                    if (chief.contains("术后") || chief.contains("孕") || chief.contains("化疗")
-                        || chief.contains("肿瘤") || chief.contains("癌") || chief.contains("确诊")
-                        || chief.contains("外伤") || chief.contains("摔伤")) {
-                        status.set("0");
-                    }
-                    else if (present.contains(diag)) {
-                        status.set("0");
-                    }
-                    else {
-                        status.set("-1");
+                if (StringUtils.isNotEmpty(differentialDiagLabel.getText())) {
+                    if (differentialDiagLabel.getText().contains("诊断明确")
+                        || differentialDiagLabel.getText().contains("无需鉴别")) {
+                        if (chief.contains("术后") || chief.contains("孕") || chief.contains("化疗")
+                                || chief.contains("肿瘤") || chief.contains("癌") || chief.contains("确诊")
+                                || chief.contains("外伤") || chief.contains("摔伤")) {
+                            status.set("0");
+                        } else if (present.contains(diag)) {
+                            status.set("0");
+                        } else {
+                            status.set("-1");
+                        }
                     }
                 }
                 else if (StringUtils.isEmpty(differentialDiagLabel.getText())) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0144.java

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.DeathCaseDiscussDoc;
 import com.lantone.qc.pub.model.doc.DeathRecordDoc;
+import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
@@ -27,9 +28,11 @@ public class THR0144 extends QCCatalogue {
             status.set("0");
             return;
         }
+        LeaveHospitalDoc leaveHospitalDoc = inputInfo.getLeaveHospitalDoc();
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
         DeathCaseDiscussDoc deathCaseDiscussDoc = inputInfo.getDeathCaseDiscussDoc();
-        if (deathRecordDoc != null || deathCaseDiscussDoc != null) {
+        /* 如果没有出院小结，就不报         如果有死亡记录、死亡讨论记录，也不报 */
+        if (leaveHospitalDoc == null || deathRecordDoc != null || deathCaseDiscussDoc != null) {
             status.set("0");
             return;
         }

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouFirstCourseRecordDocTrans.java

@@ -83,7 +83,8 @@ public class TaiZhouFirstCourseRecordDocTrans extends ModelDocTrans {
             "医生=医师签名",
             "治疗计划和措施=治疗计划",
             "体温(耳)=体温耳",
-            "体温(口)=体温口"
+            "体温(口)=体温口",
+            "病历日期=记录时间"
     );
 
 }