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

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

@@ -4,8 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Clinical;
-import com.lantone.qc.pub.model.entity.Lis;
-import com.lantone.qc.pub.model.entity.Negative;
+import com.lantone.qc.pub.model.label.PresentLabel;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -25,8 +24,16 @@ public class BEH0013 extends QCCatalogue {
         if(inputInfo.getBeHospitalizedDoc() == null){
             return;
         }
+        PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
+        if (presentLabel == null){
+            return;
+        }
+        String text = presentLabel.getText();
+        if (text.contains("无") || text.contains("否认")){
+            return;
+        }
         List<Clinical> clinicalNegative = new ArrayList<>();
-        List<Clinical> clinicals = inputInfo.getBeHospitalizedDoc().getPresentLabel().getClinicals();
+        List<Clinical> clinicals = presentLabel.getClinicals();
         if(clinicals.size()>0){
             for (Clinical clinical:clinicals) {
                 if(clinical.getNegative() != null){

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

@@ -32,7 +32,7 @@ public class BEH0018 extends QCCatalogue {
                 if (!CatalogueUtil.isEmpty(pdName)) {
                     if (pdName.contains("天") || pdName.contains("周") || pdName.contains("月")
                             || pdName.contains("时") || pdName.contains("半年") || pdName.contains("秒")
-                            || pdName.contains("日") || pdName.contains("今") || isDate(pdName)) {
+                            || pdName.contains("日") || pdName.contains("今") || pdName.contains("余年") || isDate(pdName)) {
                         status.set("0");
                         break;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0508.java

@@ -1,6 +1,9 @@
 package com.lantone.qc.kernel.catalogue.leavehospital;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.kernel.util.KernelConstants;
+import com.lantone.qc.kernel.util.RedisUtil;
+import com.lantone.qc.kernel.util.SpringContextUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
@@ -12,7 +15,7 @@ import java.util.Map;
 
 /**
  * @author kwz
- * 出院记录无副主任/主任医师签名
+ * 出院记录无执业医师签名
  * @date 2020/4/7
  * @time 21:42
  */
@@ -20,16 +23,27 @@ import java.util.Map;
 public class LEA0508 extends QCCatalogue {
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) throws ParseException {
-        status.set("0");
         LeaveHospitalDoc leaveHospitalDoc = inputInfo.getLeaveHospitalDoc();
         if (leaveHospitalDoc == null) {
+            status.set("0");
             return;
         }
         Map<String, String> structureMap = leaveHospitalDoc.getStructureMap();
-        if (structureMap != null) {
-            if (StringUtils.isEmpty(structureMap.get("医师签名"))) {
-                status.set("-1");
-            }
+        String doctorName = structureMap.get("医师签名");
+        if (StringUtils.isEmpty(doctorName)) {
+            status.set("0");
+            return;
+        }
+        RedisUtil redisUtil = SpringContextUtil.getBean("redisUtil");
+        Map<String, Object> surgeon = redisUtil.getJsonStringValue(KernelConstants.HOSPITAL_DOCTOR_MAP);
+        if (surgeon == null) {
+            status.set("0");
+            return;
+        }
+        Map<String, String> doctor = (Map) surgeon.get(doctorName);
+        String occup = doctor.get("occup");
+        if (StringUtils.isNotEmpty(occup) && "1".equals(occup)) {
+            status.set("0");
         }
     }
 }

public/src/main/java/com/lantone/qc/pub/Content.java

@@ -152,7 +152,7 @@ public class Content {
     public static final String contact_phone = "联系人电话";
 
     public static final String diagnose_cts = "诊断符合情况";
-    public static final String o_i = "门诊与住院";
+    public static final String o_i = "门诊与出院";
     public static final String i_o = "入院与出院";
     public static final String ob_oa = "术前与术后";
     public static final String clinical_pathology = "临床与病理";

trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java

@@ -43,6 +43,11 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
                 structureMap.put("专科体格检查", tgjc);
             }
         }
+        String marital = structureMap.get("婚育史");
+        String marry = structureMap.get("婚姻");
+        if (StringUtil.isBlank(marital) && StringUtil.isNotBlank(marry)){
+            structureMap.put("婚育史",marry);
+        }
         BeHospitalizedDoc beHospitalizedDoc = ModelDocGenerate.beHospitalizedDocGen(structureMap);
         beHospitalizedDoc.setText(content);
         beHospitalizedDoc.setPageData((Map) structureMap);