ソースを参照

字段标准化修改-北仑转换层修改

rengb 4 年 前
コミット
d7a6a91245
17 ファイル変更23 行追加23 行削除
  1. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunBeHospitalizedDocTrans.java
  2. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunClinicBloodEffectDocTrans.java
  3. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunClinicalBloodDocTrans.java
  4. 3 3
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunConsultationDocTrans.java
  5. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunCrisisValueReportDocTrans.java
  6. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunCriticallyIllNoticeDocTrans.java
  7. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDeathCaseDiscussDocTrans.java
  8. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDeathRecordDocTrans.java
  9. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDifficultCaseDiscussDocTrans.java
  10. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDutyShiftSystemDocTrans.java
  11. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunFirstCourseRecordDocTrans.java
  12. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunLeaveHospitalDocTrans.java
  13. 3 3
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunOperationDocTrans.java
  14. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunRescueDocTrans.java
  15. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunStagesSummaryDocTrans.java
  16. 1 1
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunThreeLevelWardDocTrans.java
  17. 3 3
      trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunTransferRecordDocTrans.java

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunBeHospitalizedDocTrans.java

@@ -34,7 +34,7 @@ public class BeiLunBeHospitalizedDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
             //初步诊断特殊处理
             if (structureMap.containsKey("初步诊断")) {
                 String initDiag = structureMap.get("初步诊断");

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunClinicBloodEffectDocTrans.java

@@ -41,7 +41,7 @@ public class BeiLunClinicBloodEffectDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         ClinicBloodEffectDoc clinicBloodEffectDoc = ModelDocGenerate.clinicBloodEffectDoc(structureMap);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunClinicalBloodDocTrans.java

@@ -42,7 +42,7 @@ public class BeiLunClinicalBloodDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         ClinicalBloodDoc clinicalBloodDoc = ModelDocGenerate.clinicalBloodDocGen(structureMap);

+ 3 - 3
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunConsultationDocTrans.java

@@ -95,7 +95,7 @@ public class BeiLunConsultationDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationRecord_keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         ConsultationRecordDoc consultationRecordDoc = ModelDocGenerate.consultationRecordDocGen(structureMap);
@@ -150,7 +150,7 @@ public class BeiLunConsultationDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationResults_pageDataTitles);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         ConsultationResultsDoc consultationResultsDoc = ModelDocGenerate.consultationResultsDocGen(structureMap);
@@ -201,7 +201,7 @@ public class BeiLunConsultationDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, consultationApplication_sourceTitles);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         ConsultationApplicationDoc consultationApplicationDoc = ModelDocGenerate.consultationApplicationDocGen(structureMap);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunCrisisValueReportDocTrans.java

@@ -42,7 +42,7 @@ public class BeiLunCrisisValueReportDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         CrisisValueReportDoc crisisValueReportDoc = ModelDocGenerate.crisisValueReportDocGen(structureMap);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunCriticallyIllNoticeDocTrans.java

@@ -43,7 +43,7 @@ public class BeiLunCriticallyIllNoticeDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         String text = CommonAnalysisUtil.html2String(content);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDeathCaseDiscussDocTrans.java

@@ -34,7 +34,7 @@ public class BeiLunDeathCaseDiscussDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         DeathCaseDiscussDoc deathCaseDiscussDoc = ModelDocGenerate.deathCaseDiscussDocGen(structureMap);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDeathRecordDocTrans.java

@@ -35,7 +35,7 @@ public class BeiLunDeathRecordDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         DeathRecordDoc deathRecordDoc = ModelDocGenerate.deathRecordDocGen(structureMap);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDifficultCaseDiscussDocTrans.java

@@ -42,7 +42,7 @@ public class BeiLunDifficultCaseDiscussDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         DifficultCaseDiscussDoc difficultCaseDiscussDoc = ModelDocGenerate.difficultCaseDiscussDocGen(structureMap);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunDutyShiftSystemDocTrans.java

@@ -42,7 +42,7 @@ public class BeiLunDutyShiftSystemDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         DutyShiftSystemDoc dutyShiftSystemDoc = ModelDocGenerate.dutyShiftSystemDocGen(structureMap);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunFirstCourseRecordDocTrans.java

@@ -39,7 +39,7 @@ public class BeiLunFirstCourseRecordDocTrans extends ModelDocTrans {
             sourceMap = removeSerialNumber(sourceMap);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
         
         String text = CommonAnalysisUtil.html2String(content);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunLeaveHospitalDocTrans.java

@@ -38,7 +38,7 @@ public class BeiLunLeaveHospitalDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         LeaveHospitalDoc leaveHospitalDoc = ModelDocGenerate.leaveHospitalDocGen(structureMap);

+ 3 - 3
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunOperationDocTrans.java

@@ -94,7 +94,7 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationDiscussion_keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         OperationDiscussionDoc operationDiscussionDoc = ModelDocGenerate.operationDiscussionDocGen(structureMap);
@@ -142,7 +142,7 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, operationRecord_keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         OperationRecordDoc operationRecordDoc = ModelDocGenerate.operationRecordDocGen(structureMap);
@@ -192,7 +192,7 @@ public class BeiLunOperationDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, preoperativeDiscussion_keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         PreoperativeDiscussionDoc preoperativeDiscussionDoc = ModelDocGenerate.preoperativeDiscussionDocGen(structureMap);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunRescueDocTrans.java

@@ -42,7 +42,7 @@ public class BeiLunRescueDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         RescueDoc rescueDoc = ModelDocGenerate.rescueDocGen(structureMap);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunStagesSummaryDocTrans.java

@@ -42,7 +42,7 @@ public class BeiLunStagesSummaryDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         StagesSummaryDoc stagesSummaryDoc = ModelDocGenerate.stagesSummaryDocGen(structureMap);

+ 1 - 1
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunThreeLevelWardDocTrans.java

@@ -61,7 +61,7 @@ public class BeiLunThreeLevelWardDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
         //structureMap.put("查房日期", structureMap.get("记录时间"));
 

+ 3 - 3
trans/src/main/java/com/lantone/qc/trans/beilun/BeiLunTransferRecordDocTrans.java

@@ -156,7 +156,7 @@ public class BeiLunTransferRecordDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         TransferIntoDoc transferIntoDoc = new TransferIntoDoc();
@@ -198,7 +198,7 @@ public class BeiLunTransferRecordDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         TransferRecordDoc transferAllDoc = new TransferRecordDoc();
@@ -241,7 +241,7 @@ public class BeiLunTransferRecordDocTrans extends ModelDocTrans {
             Map<String, String> sourceMap = beiLunHtmlAnalysis.analysis(content, recTitle, recTypeId);
             structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
             structureMap.put("记录编号", contentMap.get("recId").toString());
-            structureMap.put("病历号", contentMap.get("behospitalCode").toString());
+            structureMap.put("病历号", contentMap.get("behospitalCode") == null ? null : contentMap.get("behospitalCode").toString());
         }
 
         TransferOutDoc transferOutDoc = new TransferOutDoc();