hujing 5 rokov pred
rodič
commit
d6e33ec039

+ 20 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0059.java

@@ -8,6 +8,8 @@ import com.lantone.qc.pub.model.label.MenstrualLabel;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * @ClassName : BEH0059
  * @Description : 月经史未填写
@@ -24,6 +26,11 @@ public class BEH0059 extends QCCatalogue {
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
                 status.set("0"); //如果性别是男,就不报错
             } else {
+                String concatMenstrualText = concatMenstrualText(inputInfo);
+                if (StringUtil.isNotBlank(concatMenstrualText)) {
+                    status.set("0");
+                    return;
+                }
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 if (menstrualLabel == null) {
                     return;
@@ -39,4 +46,17 @@ public class BEH0059 extends QCCatalogue {
             }
         }
     }
+
+    private String concatMenstrualText(InputInfo inputInfo) {
+        Map<String, String> beHospitalizedStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, String> bhMap : beHospitalizedStructureMap.entrySet()) {
+            if (bhMap.getKey().contains("月经") || bhMap.getKey().contains("经期") || bhMap.getKey().contains("绝经")) {
+                if (StringUtil.isNotBlank(bhMap.getValue())) {
+                    sb.append(bhMap.getValue());
+                }
+            }
+        }
+        return sb.toString();
+    }
 }

+ 2 - 0
trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouBeHospitalizedDocTrans.java

@@ -61,6 +61,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
             "出生地址=户口地址",
             "本人电话=电话",
             "入院日期=入院日期",
+            "入病房时间=入院日期",
             "病历日期=记录日期",
             "主诉=主诉",
             "现病史=现病史",
@@ -68,6 +69,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
             "婚姻家庭关系和睦=夫妻关系",
             "体格检查=体格检查",
             "专科检查=专科体格检查",
+            "影像学检查=辅助检查",
             "初步诊断=初步诊断",
             "修正诊断=修正诊断",
             "医生=医师签名",