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

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0181.java

@@ -19,19 +19,17 @@ import java.util.Map;
 @Component
 public class FIRP0181 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
         if (inputInfo.getFirstPageRecordDoc() == null) {
-            status.set("0");
             return;
         }
 
         if (inputInfo.getFirstCourseRecordDoc() != null) {
-            status.set("0");
             return;
         }
         Map<String, String> structureMap = inputInfo.getFirstCourseRecordDoc().getStructureMap();
         String EDStr = structureMap.get("病例特点");
         if (StringUtil.isNotBlank(EDStr) && !EDStr.contains("损伤中毒")) {
-            status.set("0");
             return;
         }
 
@@ -39,9 +37,10 @@ public class FIRP0181 extends QCCatalogue {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String transferDept = firstpageStructureMap.get(Content.dp_out);
             String transferDept_changxing = firstpageStructureMap.get("损伤中毒因素");
-            if ((!CatalogueUtil.isEmpty(transferDept) && !"[]".equals(transferDept))
-                    || (!CatalogueUtil.isEmpty(transferDept_changxing) && !"[]".equals(transferDept_changxing))) {
-                status.set("0");
+            if ((CatalogueUtil.isEmpty(transferDept) || "[]".equals(transferDept))
+                    || (CatalogueUtil.isEmpty(transferDept_changxing) || "[]".equals(transferDept_changxing))) {
+                status.set("-1");
+                return;
             }
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/xiamen/threelevelward/THR0126.java

@@ -10,6 +10,7 @@ import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.doc.MedicalRecordInfoDoc;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.model.doc.ward.AttendingDoctorWardDoc;
+import com.lantone.qc.pub.model.doc.ward.DirectorDoctorWardDoc;
 import com.lantone.qc.pub.util.DateUtil;
 import com.lantone.qc.pub.util.SpringContextUtil;
 import com.lantone.qc.pub.util.StringUtil;
@@ -21,7 +22,7 @@ import java.util.Map;
 
 /**
  * @ClassName : THR0126
- * @Description : 主治医师首次查房未在48小时内完成
+ * @Description : 主治以上职称医师首次查房未在患者入院48小时内完成
  * @Author : 胡敬
  * @Date: 2020-03-19 15:50
  */
@@ -95,6 +96,11 @@ public class THR0126 extends QCCatalogue {
             }
             ThreeLevelWardDoc threeLevelWardDoc = inputInfo.getThreeLevelWardDocs().get(0);
             List<AttendingDoctorWardDoc> attendingDoctorWardDocs = threeLevelWardDoc.getAttendingDoctorWardDocs();
+            List<DirectorDoctorWardDoc> directorDoctorWardDocs = threeLevelWardDoc.getDirectorDoctorWardDocs();
+            //没有主治医师，主任医师查房，若入院时间和系统当前时间对比，相差48小时则报错
+            if (attendingDoctorWardDocs.size() == 0 && directorDoctorWardDocs.size() == 0 && CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), new Date(), 48 * 60L)) {
+                return;
+            }
             if (attendingDoctorWardDocs.size() > 0) {
                 AttendingDoctorWardDoc firstAttending = attendingDoctorWardDocs.get(0);
                 String wardDateStr = firstAttending.getStructureMap().get("查房日期");
@@ -102,9 +108,15 @@ public class THR0126 extends QCCatalogue {
                     status.set("0");
                     return;
                 }
-            } else if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), new Date(), 48 * 60L)) {
-                status.set("0");//没有主治医师查房，若入院时间和系统当前时间对比，相差48小时则报错
-                return;
+            }
+
+            if (directorDoctorWardDocs.size() > 0) {
+                DirectorDoctorWardDoc directorDoctorWardDoc = directorDoctorWardDocs.get(0);
+                String wardDateStr = directorDoctorWardDoc.getStructureMap().get("查房日期");
+                if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(wardDateStr), 48 * 60L)) {
+                    status.set("0");
+                    return;
+                }
             }
 
             /* 如果存在手术记录，判断主刀医生是否为主治医生 */

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/xiamen/threelevelward/THR03010.java

@@ -5,6 +5,8 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
+import com.lantone.qc.pub.model.doc.operation.OperationDiscussionDoc;
+import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import com.lantone.qc.pub.util.DateUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.time.DateUtils;
@@ -18,27 +20,32 @@ import java.util.Map;
 
 /**
  * @author wangfeng
- * @Description:入院后没有连续记录3天
- * 记录分为：首次病程记录+查房记录
+ * @Description:入院后没有连续记录3天 记录分为：首次病程记录+查房记录
  * @date 2020-06-29 17:16
  */
 @Component
 public class THR03010 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
+        //住院病例信息为空，终止
         if (inputInfo.getMedicalRecordInfoDoc() == null || inputInfo.getMedicalRecordInfoDoc().getStructureMap().size() == 0) {
             return;
         }
         if (inputInfo.getFirstPageRecordDoc() == null || inputInfo.getFirstPageRecordDoc().getStructureMap().size() == 0) {
             return;
         }
+        //获取入院记录文档集合
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+        //入院日期为空前面就是入院日期，入院日期不为空 前面就为空
         String behospitalDate = structureMap.get("入院日期") == null ? null : structureMap.get("入院日期");
         //String leaveHospitalDate = structureMap.get("leaveHospitalDate") == null ? null : structureMap.get("leaveHospitalDate");
+        //获取病案首页文档集合
         Map<String, String> structureMaps = inputInfo.getFirstPageRecordDoc().getStructureMap();
-        String leaveHospitalDate = structureMaps.get("出院时间")!= null ?
-                structureMaps.get("出院时间") :inputInfo.getMedicalRecordInfoDoc().getStructureMap().get("leaveHospitalDate");
+        //离开医院时间为如果出院时间不为空，则离开医院时间为出院时间，如果出院时间为空，则离开医院时间为住院病例信息集合中的离开医院日期
+        String leaveHospitalDate = structureMaps.get("出院时间") != null ?
+                structureMaps.get("出院时间") : inputInfo.getMedicalRecordInfoDoc().getStructureMap().get("leaveHospitalDate");
         if (behospitalDate != null && leaveHospitalDate != null) {
+            //解析时间
             Date beDate = StringUtil.parseDateTime(behospitalDate);
             Date leaveDate = StringUtil.parseDateTime(leaveHospitalDate);
             long l = (leaveDate.getTime() - beDate.getTime()) / (24 * 60 * 60 * 1000);
@@ -49,6 +56,7 @@ public class THR03010 extends QCCatalogue {
                 //从住院开始连续的时间列表
                 List<Date> stringDate = new ArrayList<>();
                 //当天算进去所以从零开始
+                //获取从当天开始的后三天日期时 分 秒
                 for (int i = 0; i < 4; i++) {
                     stringDate.add(DateUtil.getFirstTimeOfDay(DateUtil.addDay(beDate, i)));
                 }
@@ -57,11 +65,10 @@ public class THR03010 extends QCCatalogue {
                 List<Date> wordDateList = new ArrayList<>();
                 //获取首次病程记录时间
                 FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
-                if(firstCourseRecordDoc!=null
-                        &&StringUtil.isNotBlank(firstCourseRecordDoc.getStructureMap().get("病历日期"))) {
+                if (firstCourseRecordDoc != null
+                        && StringUtil.isNotBlank(firstCourseRecordDoc.getStructureMap().get("病历日期"))) {
                     String firstCourseRecorTime = firstCourseRecordDoc.getStructureMap().get("病历日期");
-                    if(StringUtil.isNotBlank(firstCourseRecorTime))
-                    {
+                    if (StringUtil.isNotBlank(firstCourseRecorTime)) {
                         wordDateList.add(StringUtil.parseDateTime(firstCourseRecorTime));
                     }
                 }
@@ -70,26 +77,36 @@ public class THR03010 extends QCCatalogue {
                 for (ThreeLevelWardDoc t : threeLevelWardDocs) {
                     Date threeLevelDate = StringUtil.parseDateTime(t.getStructureMap().get("查房日期"));
                     //去重，同一天就存一次
-                    if(threeLevelDate!=null&&wordDateList.get(wordDateList.size()-1)!=null
-                            &&!DateUtils.isSameDay(wordDateList.get(wordDateList.size()-1),threeLevelDate))
-                    {
+                    if (threeLevelDate != null && wordDateList.get(wordDateList.size() - 1) != null
+                            && !DateUtils.isSameDay(wordDateList.get(wordDateList.size() - 1), threeLevelDate)) {
                         wordDateList.add(threeLevelDate);
                     }
                 }
+
+                //获取手术首次病程录时间
+                List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
+                if (operationDocs != null) {
+                    for (OperationDoc t : operationDocs) {
+                        OperationDiscussionDoc operationDiscussionDoc = t.getOperationDiscussionDoc();
+                        if (operationDiscussionDoc != null) {
+                            Date firstOperationtime = StringUtil.parseDateTime(operationDiscussionDoc.getStructureMap().get("病历日期"));
+                            if (firstOperationtime != null) {
+                                wordDateList.add(firstOperationtime);
+                            }
+                        }
+                    }
+                }
+
                 //如果记录时间没有3天
-                if(wordDateList.size()<3)
-                {
+                if (wordDateList.size() < 3) {
                     status.set("-1");
                     return;
                 }
                 //如果住院当天开始做记录
-                if(DateUtils.isSameDay(stringDate.get(0),wordDateList.get(0)))
-                {
-                    for(int i = 1;i<=2;i++)
-                    {
+                if (DateUtils.isSameDay(stringDate.get(0), wordDateList.get(0))) {
+                    for (int i = 1; i <= 2; i++) {
                         //如果时间不相等则时间不连续
-                        if(!DateUtils.isSameDay(stringDate.get(i),wordDateList.get(i)))
-                        {
+                        if (!DateUtils.isSameDay(stringDate.get(i), wordDateList.get(i))) {
                             status.set("-1");
                             return;
                         }
@@ -97,13 +114,10 @@ public class THR03010 extends QCCatalogue {
                     return;
                 }
                 //如果是住院后第二天开始
-                else
-                {
-                    for(int i = 0;i<=3;i++)
-                    {
+                else {
+                    for (int i = 0; i <= 3; i++) {
                         //如果时间不相等则时间不连续
-                        if(!DateUtils.isSameDay(stringDate.get(i+1),wordDateList.get(i)))
-                        {
+                        if (!DateUtils.isSameDay(stringDate.get(i + 1), wordDateList.get(i))) {
                             status.set("-1");
                             return;
                         }

trans/src/main/java/com/lantone/qc/trans/xszyy/util/BeiLunFirstCourseRecordHtmlAnalysis.java

@@ -35,15 +35,43 @@ public class BeiLunFirstCourseRecordHtmlAnalysis implements BeiLunHtmlAnalysis {
             );
             String htmlContent = XszyyCommonAnalysisUtil.html2String(doc.toString());
             if (StringUtil.isNotBlank(htmlContent)) {
+                //有冒号
+                //XszyyCommonAnalysisUtil.html2StructureMap(titles,htmlContent,structureMap);
                 //无冒号版本
                 XszyyCommonAnalysisUtil.html2StructureMapNoColon(titles,htmlContent,structureMap);
+                if(XszyyCommonAnalysisUtil.extractDate(htmlContent)!=null){
+                    structureMap.put("病历日期",XszyyCommonAnalysisUtil.extractDate(htmlContent.replace("：",":")));
+                }
                 if(htmlContent.contains("病历特点")){
-                    structureMap.put("病历内容",htmlContent.substring(0,htmlContent.indexOf("病历特点")));
+                    structureMap.put("病历内容",htmlContent.substring(0,htmlContent.indexOf("病历特点")).replace(recTitle,""));
                 }else if(htmlContent.contains("病例特点")){
-                    structureMap.put("病历内容",htmlContent.substring(0,htmlContent.indexOf("出院记录内容缺诊疗经过")));
+                    structureMap.put("病历内容",htmlContent.substring(0,htmlContent.indexOf("病例特点")).replace(recTitle,""));
                 }
-                if(XszyyCommonAnalysisUtil.extractDate(htmlContent)!=null){
-                    structureMap.put("病历日期",XszyyCommonAnalysisUtil.extractDate(htmlContent));
+                structureMap.put("病历内容",structureMap.get("病历内容").replace("：",":").replace(structureMap.get("病历日期"),""));
+
+                List<String> specialString = Lists.newArrayList(
+                        "无需其他特殊鉴别诊断","无需鉴别","无须鉴别"
+                );
+                if(StringUtil.isNotEmpty(structureMap.get("西医诊断依据及鉴别诊断"))){
+                    String diag=structureMap.get("西医诊断依据及鉴别诊断");
+                    if(diag.contains("入院诊断")){
+                        int index=diag.indexOf("入院诊断");
+                        structureMap.put("初步诊断",diag.substring(index));
+                        diag=diag.replace(structureMap.get("初步诊断"),"");
+                    }
+                    if(StringUtil.isEmpty(structureMap.get("西医诊断依据")) && StringUtil.isEmpty(structureMap.get("西医鉴别诊断"))){
+                        structureMap.put("西医诊断依据",diag);
+                        structureMap.put("西医诊断依据及鉴别诊断","");
+                        /*for (String specialC:specialString){
+                            if(structureMap.get("西医诊断依据").contains(specialC)){
+                                structureMap.put("西医鉴别诊断","无需鉴别");
+                            }
+                        }*/
+                    }
+                }
+                if(StringUtil.isNotEmpty(structureMap.get("拟诊讨论")) && StringUtil.isEmpty(structureMap.get("中医辨病辩证依据及鉴别诊断"))){
+                    structureMap.put("中医辨病辩证依据及鉴别诊断",structureMap.get("拟诊讨论"));
+                    structureMap.put("拟诊讨论","");
                 }
             }
             structureMap.put("标题",recTitle);