查房医生职称 修改

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

@@ -7,7 +7,7 @@ import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
-import com.lantone.qc.pub.model.doc.ward.DirectorDoctorWardDoc;
+import com.lantone.qc.pub.model.doc.ward.AttendingDoctorWardDoc;
 import com.lantone.qc.pub.util.SpringContextUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
@@ -40,14 +40,14 @@ public class THR03015 extends QCCatalogue {
 
         boolean findIndications = false;
         ThreeLevelWardDoc threeLevelWardDoc = inputInfo.getThreeLevelWardDocs().get(0);
-        List<DirectorDoctorWardDoc> directorDoctorWardDocs = threeLevelWardDoc.getDirectorDoctorWardDocs();
+        List<AttendingDoctorWardDoc> attendingDoctorWardDocs = threeLevelWardDoc.getAttendingDoctorWardDocs();
         String jlDateStr, shDateStr, professor;
-        for (DirectorDoctorWardDoc directorDoctorWardDoc : directorDoctorWardDocs) {
-            jlDateStr = directorDoctorWardDoc.getStructureMap().get("病历日期");
-            shDateStr = directorDoctorWardDoc.getStructureMap().get("审核日期");
-            professor = getProfessor(directorDoctorWardDoc.getStructureMap().get("审核人"));
+        for (AttendingDoctorWardDoc attendingDoctorWardDoc : attendingDoctorWardDocs) {
+            jlDateStr = attendingDoctorWardDoc.getStructureMap().get("记录时间");
+            shDateStr = attendingDoctorWardDoc.getStructureMap().get("审核日期");
+            professor = getProfessor(attendingDoctorWardDoc.getStructureMap().get("审核人"));
             if (StringUtil.isBlank(professor)
-                    || !professor.contains("主任")
+                    || !professor.contains("主治")
                     || CatalogueUtil.compareTime(StringUtil.parseDateTime(jlDateStr), StringUtil.parseDateTime(shDateStr), 7 * 24 * 60L)) {
                 findIndications = false;
                 break;

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

@@ -7,7 +7,7 @@ import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 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.SpringContextUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
@@ -40,14 +40,14 @@ public class THR03017 extends QCCatalogue {
 
         boolean findIndications = false;
         ThreeLevelWardDoc threeLevelWardDoc = inputInfo.getThreeLevelWardDocs().get(0);
-        List<AttendingDoctorWardDoc> attendingDoctorWardDocs = threeLevelWardDoc.getAttendingDoctorWardDocs();
+        List<DirectorDoctorWardDoc> directorDoctorWardDocs = threeLevelWardDoc.getDirectorDoctorWardDocs();
         String jlDateStr, shDateStr, professor;
-        for (AttendingDoctorWardDoc attendingDoctorWardDoc : attendingDoctorWardDocs) {
-            jlDateStr = attendingDoctorWardDoc.getStructureMap().get("病历日期");
-            shDateStr = attendingDoctorWardDoc.getStructureMap().get("审核日期");
-            professor = getProfessor(attendingDoctorWardDoc.getStructureMap().get("审核人"));
+        for (DirectorDoctorWardDoc directorDoctorWardDoc : directorDoctorWardDocs) {
+            jlDateStr = directorDoctorWardDoc.getStructureMap().get("记录时间");
+            shDateStr = directorDoctorWardDoc.getStructureMap().get("审核日期");
+            professor = getProfessor(directorDoctorWardDoc.getStructureMap().get("审核人"));
             if (StringUtil.isBlank(professor)
-                    || !professor.contains("主治")
+                    || !professor.contains("主任")
                     || CatalogueUtil.compareTime(StringUtil.parseDateTime(jlDateStr), StringUtil.parseDateTime(shDateStr), 48 * 60L)) {
                 findIndications = false;
                 break;

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfThreeLevelWardDocTrans.java

@@ -12,10 +12,12 @@ import com.lantone.qc.pub.model.doc.ward.AttendingDoctorWardDoc;
 import com.lantone.qc.pub.model.doc.ward.DirectorDoctorWardDoc;
 import com.lantone.qc.pub.model.doc.ward.GeneralDoctorWardDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
+import com.lantone.qc.pub.util.MapUtil;
 import com.lantone.qc.pub.util.SpringContextUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
+import com.lantone.qc.trans.shaoyf.util.ShaoyfOrdinaryAssistant;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 
@@ -91,6 +93,10 @@ public class ShaoyfThreeLevelWardDocTrans extends ModelDocTrans {
             structureMap.put("查房标题", title);
         }
 
+        MapUtil.keyAssig(structureMap, "记录时间", "病历日期");
+        ShaoyfOrdinaryAssistant.techTitleDocRemove(structureMap, "审核人");
+        ShaoyfOrdinaryAssistant.techTitleDocRemove(structureMap, "记录医师");
+
         //总的查房记录 汇总
         ThreeLevelWardDoc allDoctorWradDoc = new ThreeLevelWardDoc();
         allDoctorWradDoc.setStructureMap(structureMap);
@@ -171,7 +177,6 @@ public class ShaoyfThreeLevelWardDocTrans extends ModelDocTrans {
     }
 
     private List<String> keyContrasts = Lists.newArrayList(
-            "事件日期=记录时间",
             "事件日期=查房日期",
             "简要病情=病情记录",
             "查房记录=病情记录",