Merge branch 'beilun/dev-fqw' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/behospitalized/BEH0068.java

@@ -38,7 +38,7 @@ public class BEH0068 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 String text = menstrualLabel.getText();
-                if (StringUtil.isNotBlank(text) && (text.contains("未行经") || text.contains("未来潮") || text.contains("绝经") || text.contains("白带正常"))) {
+                if (StringUtil.isNotBlank(text) && (text.contains("未行经") || text.contains("未来潮") || text.contains("绝经") || text.contains("白带"))) {
                     status.set("0");
                     return;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/yiwu/threelevelward/THR0122.java

@@ -26,7 +26,7 @@ public class THR0122 extends QCCatalogue {
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
             String admisDate = beHospitalStructureMap.get(Content.admisDate);
             Map<String, String> firstCourseRecordStructureMap = inputInfo.getFirstCourseRecordDoc().getStructureMap();
-            String recordTime = firstCourseRecordStructureMap.get("记录时间");
+            String recordTime = firstCourseRecordStructureMap.get("病历日期");
             if (CatalogueUtil.isEmpty(admisDate) || CatalogueUtil.isEmpty(recordTime)) {
                 return;
             }

trans/src/main/java/com/lantone/qc/trans/yiwu/YiWuFirstCourseRecordDocTrans.java

@@ -116,7 +116,6 @@ public class YiWuFirstCourseRecordDocTrans extends ModelDocTrans {
             "治疗计划和措施=治疗计划",
             "体温(耳)=体温耳",
             "体温(口)=体温口",
-            "病历日期=记录时间",
             "病程时间=病历日期",
             "记录医师=记录医生",
             "病例日期=病历日期"