台州运行质控修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE0587.java

@@ -7,8 +7,6 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationRecordDoc;
-import com.lantone.qc.pub.model.doc.transferrecord.TransferOutDoc;
-import com.lantone.qc.pub.model.doc.transferrecord.TransferRecordDoc;
 import com.lantone.qc.pub.util.DateUtil;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
@@ -20,7 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @ClassName : THR0587
+ * @ClassName : OPE0587
  * @Description : 术后病程录没有连续记录3天
  * @Author : 胡敬
  * @Date: 2020-03-30 16:17

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0125.java

@@ -10,6 +10,7 @@ import com.lantone.qc.pub.model.doc.ward.DirectorDoctorWardDoc;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -39,6 +40,18 @@ public class THR0125 extends QCCatalogue {
                 status.set("0");
                 return;
             }
+        }
+        if (inputInfo.getBeHospitalizedDoc() != null) {
+            Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+            String admisTime = beHospitalStructureMap.get("入院日期");
+            if (CatalogueUtil.isEmpty(admisTime)) {
+                return;
+            }
+            //开始时间(入院时间)
+            Date beginDate = StringUtil.parseDateTime(admisTime);
+            if (beginDate == null) {
+                return;
+            }
             ThreeLevelWardDoc threeLevelWardDoc = inputInfo.getThreeLevelWardDocs().get(0);
             List<DirectorDoctorWardDoc> directorDoctorWardDocs = threeLevelWardDoc.getDirectorDoctorWardDocs();
             if (directorDoctorWardDocs.size() > 0) {
@@ -48,9 +61,6 @@ public class THR0125 extends QCCatalogue {
                     status.set("0");
                 }
             }
-        } else {
-            //没有出院小结，这条直接不报错
-            status.set("0");
         }
     }
 }

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

@@ -46,6 +46,18 @@ public class THR0126 extends QCCatalogue {
                 status.set("0");
                 return;
             }
+        }
+        if (inputInfo.getBeHospitalizedDoc() != null) {
+            Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+            String admisTime = beHospitalStructureMap.get("入院日期");
+            if (CatalogueUtil.isEmpty(admisTime)) {
+                return;
+            }
+            //开始时间(入院时间)
+            Date beginDate = StringUtil.parseDateTime(admisTime);
+            if (beginDate == null) {
+                return;
+            }
             /* 首次病程录如果是主治或者主任写的，也算主治查房 */
             FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
             if (firstCourseRecordDoc != null) {
@@ -68,16 +80,13 @@ public class THR0126 extends QCCatalogue {
                     status.set("0");
                 }
             }
-        } else {
-            //没有出院小结，这条直接不报错
-            status.set("0");
         }
     }
 
     private String getFirstCourseProfessor(FirstCourseRecordDoc firstCourseRecordDoc) {
         String professor = "";
         String doctorSign = firstCourseRecordDoc.getStructureMap().get("记录医师");
-        if (StringUtil.isBlank(doctorSign)){
+        if (StringUtil.isBlank(doctorSign)) {
             return professor;
         }
         SpecialStorageUtil specialStorageUtil = SpringContextUtil.getBean("specialStorageUtil");

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02880.java

@@ -30,6 +30,7 @@ public class THR02880 extends QCCatalogue {
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
         String firstCourseDiffDiag = getDiffDiag(firstCourseRecordDoc);
         if (StringUtil.isBlank(firstCourseDiffDiag)) {
+            status.set("0");
             return;
         }
         if (directorDocs.size() == 0) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0701.java

@@ -29,6 +29,7 @@ public class THR0701 extends QCCatalogue {
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
         String firstCourseDiffDiag = getDiffDiag(firstCourseRecordDoc);
         if (StringUtil.isBlank(firstCourseDiffDiag)) {
+            status.set("0");
             return;
         }
         if (attendDocs.size() == 0) {

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouDifficultCaseDiscussDocTrans.java

@@ -46,7 +46,8 @@ public class TaiZhouDifficultCaseDiscussDocTrans extends ModelDocTrans {
             "讨论小结=结 论",
             "讨论意见=讨论内容",
             "事件日期=讨论时间",
-            "本人姓名=姓名"
+            "本人姓名=姓名",
+            "参加人员及职称（护士）=参加讨论者"
     );
 
 }