Merge remote-tracking branch 'origin/debug' into debug

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

@@ -36,6 +36,11 @@ public class FIRP0173 extends QCCatalogue {
             }
             //现病史所有诊断
             List<Diag> presentDiags = inputInfo.getBeHospitalizedDoc().getPresentLabel().getDiags();
+            for (Diag diag : presentDiags) {
+                if(diag.getHospitalDiagName().equals(outpatientEmergencyDiag)){
+                    status.set("0");
+                }
+            }
             List<Diag> presentPossibleDiag = presentDiags.stream().filter(diag -> diag.getPossible() != null).collect(Collectors.toList());
             if (presentPossibleDiag.size() > 0) {
                 if (presentPossibleDiag.get(0).getHospitalDiagName().equals(outpatientEmergencyDiag)) {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0147.java

@@ -36,7 +36,7 @@ public class LEA0147 extends QCCatalogue {
             return;
         }
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() == null) {
+        if (deathRecordDoc == null) {
             DiagLabel leaveDiagLabel = leaveHospitalDoc.getLeaveDiagLabel();
             if (leaveDiagLabel != null) {
                 List<Diag> diags = leaveDiagLabel.getDiags();

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA0507.java

@@ -17,7 +17,7 @@ public class LEA0507 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         DeathRecordDoc deathRecordDoc = inputInfo.getDeathRecordDoc();
-        if (deathRecordDoc == null || deathRecordDoc.getText() == null) {
+        if (deathRecordDoc == null) {
             if (inputInfo.getLeaveHospitalDoc() == null) {
                 status.set("-1");
             }

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

@@ -28,11 +28,12 @@ public class TaiZhouDutyShiftSystemDocTrans extends ModelDocTrans {
     }
 
     private DutyShiftSystemDoc getDutyShiftSystemDoc(String content) {
+        Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZWithReplace(content); // xml原始数据给华卓
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(TzXmlUtil.getXmlToMapForTZ(content), keyContrasts);
 
         DutyShiftSystemDoc dutyShiftSystemDoc = new DutyShiftSystemDoc();
         dutyShiftSystemDoc.setStructureMap(structureMap);
-
+        dutyShiftSystemDoc.setPageData((Map)sourceMap);
         return dutyShiftSystemDoc;
     }