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

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

@@ -32,7 +32,12 @@ public class THR02931 extends QCCatalogue {
             return;
         }
         String leaveDateStr = null;
-        if (inputInfo.getMedicalRecordInfoDoc() != null) {
+        Map<String, String> LeaveHospitalStructureMap = inputInfo.getLeaveHospitalDoc().getStructureMap();
+        if (StringUtil.isNotBlank(LeaveHospitalStructureMap.get("出院日期"))) {
+            leaveDateStr = LeaveHospitalStructureMap.get("出院日期");
+        }
+
+        if (StringUtil.isBlank(leaveDateStr) && inputInfo.getMedicalRecordInfoDoc() != null) {
             Map<String, String> medicalRecordInfoStructureMap = inputInfo.getMedicalRecordInfoDoc().getStructureMap();
             leaveDateStr = medicalRecordInfoStructureMap.get("leaveHospitalDate");
         }