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

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

@@ -6,7 +6,7 @@ import com.lantone.qc.pub.Content;
 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.StringUtil;
 import org.springframework.stereotype.Component;
 
@@ -40,10 +40,10 @@ public class THR03020 extends QCCatalogue {
                 return;
             }
             ThreeLevelWardDoc threeLevelWardDoc = inputInfo.getThreeLevelWardDocs().get(0);
-            List<AttendingDoctorWardDoc> attendingDoctorWardDocs = threeLevelWardDoc.getAttendingDoctorWardDocs();
-            if (attendingDoctorWardDocs.size() > 0) {
-                AttendingDoctorWardDoc firstAttending = attendingDoctorWardDocs.get(0);
-                String wardDateStr = firstAttending.getStructureMap().get("查房日期");
+            List<DirectorDoctorWardDoc> directorDoctorWardDocs = threeLevelWardDoc.getDirectorDoctorWardDocs();
+            if (directorDoctorWardDocs.size() > 0) {
+                DirectorDoctorWardDoc firstDirectorg = directorDoctorWardDocs.get(0);
+                String wardDateStr = firstDirectorg.getStructureMap().get("查房日期");
                 if (!CatalogueUtil.compareTime(StringUtil.parseDateTime(admisTime), StringUtil.parseDateTime(wardDateStr), 72 * 60L)) {
                     status.set("0");
                 }

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

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.doc.LeaveHospitalDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
+import com.lantone.qc.trans.shaoyf.util.ShaoyfOrdinaryAssistant;
 
 import java.util.List;
 import java.util.Map;
@@ -26,8 +27,9 @@ public class ShaoyfLeaveHospitalDocTrans extends ModelDocTrans {
         sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
         sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        structureMap.put("入院情况",structureMap.get("入院病情"));
-        structureMap.put("出院时间",structureMap.get("出院日期"));
+        structureMap.put("入院情况", structureMap.get("入院病情"));
+        structureMap.put("出院时间", structureMap.get("出院日期"));
+        ShaoyfOrdinaryAssistant.techTitleDocRemove(structureMap, "医师签名");
         LeaveHospitalDoc leaveHospitalDoc = new LeaveHospitalDoc();
         leaveHospitalDoc.setStructureMap(structureMap);
         leaveHospitalDoc.setPageData((Map) structureMap);