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

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

@@ -4,6 +4,7 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.Map;
@@ -25,11 +26,8 @@ public class BEH0458 extends QCCatalogue {
         Map<String, String> bhMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if (bhMap != null) {
             String birthDate = bhMap.get("长期用药情况\\(包括可能成瘾的药物\\)");
-            if (birthDate != null) {
-                if (CatalogueUtil.isEmpty(birthDate)) {
-                    status.set("-1");
-                }
-            } else {
+            String addictiveDrugs = bhMap.get("成瘾药物");
+            if (StringUtil.isBlank(birthDate) && StringUtil.isBlank(addictiveDrugs)) {
                 status.set("-1");
             }
         }

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

@@ -51,11 +51,14 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
     private List<String> keyContrasts = Lists.newArrayList(
             "姓名++++患者姓名=姓名",
             "出生地++++出生地（住院）=出生地",
+            "工作单位++++工作单位地址=工作单位",
             "婚姻状况++++婚姻=婚姻",
             "联系电话=电话",
             "供史者++++病史叙述者=病史陈述者",
+            "++++病史叙述者=病史陈述者",
             "婚育史:=婚育史",
             "外生殖器++++外生殖器文本框=",
+            "户口地址=联系地址",
             "职业++++首页职业新=职业"
     );
 

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

@@ -16,8 +16,8 @@ public class ChangxNoticeOfConversationDocTrans extends ModelDocTrans {
     @Override
     public NoticeOfConversationDoc extract(MedrecVo medrecVo) {
         NoticeOfConversationDoc noticeOfConversationDoc = new NoticeOfConversationDoc();
-        List<String> noticeofConverstartons = (List<String>) medrecVo.getContent().get("content");
-        noticeOfConversationDoc.setAllNoticeOfConverstartion(noticeofConverstartons);
+//        List<String> noticeofConverstartons = (List<String>) medrecVo.getContent().get("content");
+//        noticeOfConversationDoc.setAllNoticeOfConverstartion(noticeofConverstartons);
         return noticeOfConversationDoc;
     }
 }

trans/src/main/java/com/lantone/qc/trans/comsis/ModelDocGenerate.java

@@ -146,76 +146,79 @@ public class ModelDocGenerate {
         ChiefLabel chiefLabel = new ChiefLabel();
         chiefLabel.setText(structureMap.get("主诉"));
         beHospitalizedDoc.setChiefLabel(chiefLabel);
-        structureMap.remove("主诉");
+//        structureMap.remove("主诉");
 
         PresentLabel presentLabel = new PresentLabel();
         presentLabel.setText(structureMap.get("现病史"));
         beHospitalizedDoc.setPresentLabel(presentLabel);
-        structureMap.remove("现病史");
+//        structureMap.remove("现病史");
 
         PastLabel pastLabel = new PastLabel();
         pastLabel.setText(structureMap.get("既往史"));
         beHospitalizedDoc.setPastLabel(pastLabel);
-        structureMap.remove("既往史");
+//        structureMap.remove("既往史");
 
         PersonalLabel personalLabel = new PersonalLabel();
         personalLabel.setText(structureMap.get("个人史"));
         beHospitalizedDoc.setPersonalLabel(personalLabel);
-        structureMap.remove("个人史");
+//        structureMap.remove("个人史");
 
         MaritalLabel maritalLabel = new MaritalLabel();
         if (structureMap.get("婚育史") != null) {
             maritalLabel.setText("婚育史：" + structureMap.get("婚育史"));
         }
         beHospitalizedDoc.setMaritalLabel(maritalLabel);
-        structureMap.remove("婚育史");
+//        structureMap.remove("婚育史");
 
         MenstrualLabel menstrualLabel = new MenstrualLabel();
-        if(structureMap != null && structureMap.get("月经史") != null){
+        if(structureMap.get("月经史") != null){
             if(structureMap.get("月经史").contains("月 经 史")){
-                String text = structureMap.get("月经史");
-                structureMap.put("月经史",text.replace("月 经 史","").replace(":","").replace("：",""));
+                String text = structureMap.get("月经史").replaceAll("月 经 史|:|：","");
+                if (text.startsWith("，")){
+                    text = text.substring(1);
+                }
+                structureMap.put("月经史",text);
             }
 
         }
         menstrualLabel.setText("月经史：" + structureMap.get("月经史"));
         beHospitalizedDoc.setMenstrualLabel(menstrualLabel);
-        structureMap.remove("月经史");
+//        structureMap.remove("月经史");
 
         FamilyLabel familyLabel = new FamilyLabel();
         familyLabel.setText(structureMap.get("家族史"));
         beHospitalizedDoc.setFamilyLabel(familyLabel);
-        structureMap.remove("家族史");
+//        structureMap.remove("家族史");
 
         VitalLabel vitalLabel = new VitalLabel();
         vitalLabel.setText(structureMap.get("体格检查"));
         beHospitalizedDoc.setVitalLabel(vitalLabel);
-        structureMap.remove("体格检查");
+//        structureMap.remove("体格检查");
 
         VitalLabelSpecial vitalLabelSpecial = new VitalLabelSpecial();
         vitalLabelSpecial.setText(structureMap.get("专科体格检查"));
         beHospitalizedDoc.setVitalLabelSpecial(vitalLabelSpecial);
-        structureMap.remove("专科体格检查");
+//        structureMap.remove("专科体格检查");
 
         PacsLabel pacsLabel = new PacsLabel();
         pacsLabel.setText(structureMap.get("辅助检查"));
         beHospitalizedDoc.setPacsLabel(pacsLabel);
-        structureMap.remove("辅助检查");
+//        structureMap.remove("辅助检查");
 
         DiagLabel initialDiagLabel = new DiagLabel();
         initialDiagLabel.setText(structureMap.get("初步诊断"));
         beHospitalizedDoc.setInitialDiagLabel(initialDiagLabel);
-        structureMap.remove("初步诊断");
+//        structureMap.remove("初步诊断");
 
         DiagLabel revisedDiagLabel = new DiagLabel();
         revisedDiagLabel.setText(structureMap.get("修正诊断"));
         beHospitalizedDoc.setRevisedDiagLabel(revisedDiagLabel);
-        structureMap.remove("修正诊断");
+//        structureMap.remove("修正诊断");
 
         DiagLabel suppleDiagLabel = new DiagLabel();
         suppleDiagLabel.setText(structureMap.get("补充诊断"));
         beHospitalizedDoc.setSuppleDiagLabel(suppleDiagLabel);
-        structureMap.remove("补充诊断");
+//        structureMap.remove("补充诊断");
 
         beHospitalizedDoc.setStructureMap(structureMap);