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

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/yiwu/YiWuXmlUtil.java

@@ -76,7 +76,7 @@ public class YiWuXmlUtil {
     //获取 XInputField 的键
     private static String getXInputFieldKey(Element xInputFieldElement, String tablePreTxt) {
         String key = null;
-        String[] elementNames = { "Name", "BackgroundText", "ToolTip" };
+        String[] elementNames = {"Name","BackgroundText", "ToolTip" };
         for (String elementName : elementNames) {
             key = xInputFieldElement.elementTextTrim(elementName);
             if (StringUtil.isNotBlank(key)) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/operationdiscussion/OPE0369.java

@@ -40,11 +40,12 @@ public class OPE0369 extends QCCatalogue {
                 return;
             }
 //            Map<Date, String> operationDateNameMap = Maps.newLinkedHashMap();
+            String operationStartDate = "";
             List<Date> operDateList = new ArrayList<>();
             for (OperationDoc operationDoc : operationDocs) {
                 if (operationDoc.getOperationRecordDoc() != null) {
                     Map<String, String> operationDocStructureMap = operationDoc.getOperationRecordDoc().getStructureMap();
-                    String operationStartDate = operationDocStructureMap.get("手术开始时间");
+                    operationStartDate = operationDocStructureMap.get("手术开始时间");
                     if (StringUtil.isNotBlank(operationStartDate)) {
                         operDateList.add(StringUtil.parseDateTime(operationStartDate));
                     }
@@ -74,9 +75,16 @@ public class OPE0369 extends QCCatalogue {
             for (ThreeLevelWardDoc threeLevelWard : allDoctorWradDocs) {
                 Map<String, String> structureMap = threeLevelWard.getStructureMap();
                 String makeTitle = structureMap.get("查房标题");
-                if (makeTitle.contains("术前主刀")) {
+                if (makeTitle.contains("术前") && makeTitle.contains("主刀")) {
                     operateCount++;
                 }
+                if (operateCount == 0 && makeTitle.contains("主刀")) {
+                    String recordDateStr = structureMap.get("查房日期");
+                    if (StringUtil.isNotBlank(recordDateStr) && StringUtil.isNotBlank(operationStartDate) &&
+                            StringUtil.parseDateTime(recordDateStr).before(StringUtil.parseDateTime(operationStartDate))) {
+                        operateCount++;
+                    }
+                }
             }
         }
 

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0134.java

@@ -36,7 +36,7 @@ public class THR0134 extends QCCatalogue {
         String admisDateStr = inputInfo.getBeHospitalizedDoc().getStructureMap().get("入院日期");
         String recordDateStr = firstAttendStructureMap.get("查房日期");
         String content = firstAttendStructureMap.get("病情记录");
-        if (content.contains("诊断明确") || content.contains("目前诊断") || content.contains("目前考虑") ||
+        if (content.contains("诊断明确") || content.contains("目前诊断") || content.contains("目前考虑") || content.contains("当前诊断") ||
                 content.contains("考虑诊断") || content.contains("诊断考虑") || content.contains("诊断基本明确") || content.contains("初步诊断")) {
             status.set("0");
             return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0139.java

@@ -36,7 +36,7 @@ public class THR0139 extends QCCatalogue {
         String admisDateStr = inputInfo.getBeHospitalizedDoc().getStructureMap().get("入院日期");
         String recordDateStr = firstDirectStructureMap.get("查房日期");
         String content = firstDirectStructureMap.get("病情记录");
-        if (content.contains("诊断明确") || content.contains("目前诊断") || content.contains("目前考虑") ||
+        if (content.contains("诊断明确") || content.contains("目前诊断") || content.contains("目前考虑") || content.contains("当前诊断") ||
                 content.contains("考虑诊断") || content.contains("诊断考虑") || content.contains("诊断基本明确") || content.contains("初步诊断")) {
             status.set("0");
             return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/threelevelward/THR0588.java

@@ -33,6 +33,13 @@ public class THR0588 extends QCCatalogue {
             Map<String, String> medicalRecordInfoStructureMap = inputInfo.getMedicalRecordInfoDoc().getStructureMap();
             String leaveHospitalTime = medicalRecordInfoStructureMap.get("leaveHospitalDate");
             leaveDate = StringUtil.parseDateTime(leaveHospitalTime);
+            if (leaveDate == null) {
+//                LeaveHospitalDoc leaveHospitalDoc = inputInfo.getLeaveHospitalDoc();
+//                if (leaveHospitalDoc != null) {
+//                    leaveDate = StringUtil.parseDateTime(leaveHospitalDoc.getStructureMap().get("出院日期"));
+//                }
+                leaveDate = new Date();
+            }
         }
         //查房记录
         List<ThreeLevelWardDoc> threeLevelWardDocs = inputInfo.getThreeLevelWardDocs();

trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunOperationDocTrans.java

@@ -110,8 +110,8 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
         }
         if (MapUtils.isNotEmpty(structureMap)) {
             OperationDiscussionDoc operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
-            String text = BeiLunHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body").child(0), true);
-            operationDiscussionDoc.setText(text);
+//            String text = BeiLunHtmlAnalysisUtil.blockDivToStr(Jsoup.parse(content).selectFirst("body").child(0), true);
+//            operationDiscussionDoc.setText(text);
             operationDiscussionDoc.setPageData((Map) structureMap);
             return operationDiscussionDoc;
         } else {
@@ -396,4 +396,4 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
             "病案号++++住院号=病案号",
             "签名++++=签名"
     );
-}
+}

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

@@ -50,10 +50,16 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
             sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts, modeId);
+            //新生儿科姓名+姓名问题解决
             if(structureMap.containsKey("姓名")){
                 String value =structureMap.get("姓名").split(" ")[0];
                 structureMap.put("姓名",value);
             }
+            //产科孕产次
+            if(structureMap.containsKey("入院记录")){
+                String value =structureMap.get("入院记录").split(" ")[0];
+                structureMap.put("孕产次",value);
+            }
             OrdinaryAssistant.removeBlank(structureMap);
         }
         /*if (StringUtils.isEmpty(structureMap.get("入院时间")) && StringUtils.isNotEmpty(structureMap.get("入病房时间"))) {
@@ -134,11 +140,11 @@ public class YiWuBeHospitalizedDocTrans extends ModelDocTrans {
             "末次月经日期=末次月经",
             "入院诊断1=初步诊断",
             "记录医师=初步诊断医师签名",
-            "病历内容=初步诊断医师签名",
-            "日期=初步诊断日期",
             "修正诊断签名日期=修正诊断日期",
             "修正诊断一医师签名=修正诊断医师签名",
-            "患者姓名=姓名"
+            "患者姓名=姓名",
+            "年月日=初步诊断日期",
+            "年月日时分=初步诊断日期"
 
     );