Browse Source

厦门:映射更新

wangsy 4 years ago
parent
commit
ab0a8463f7

+ 6 - 8
kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/behospitalized/BEH0414.java

@@ -31,10 +31,10 @@ public class BEH0414 extends QCCatalogue {
             String newbornAgeDays = firstpageStructureMap.get(Content.newbornAgeDays);
             String newbornAgeDays = firstpageStructureMap.get(Content.newbornAgeDays);
             String newbornAgeStr = "";
             String newbornAgeStr = "";
             int newbornAge = 0;
             int newbornAge = 0;
-            if (StringUtil.isNotBlank(newbornAgeMonths) && StringUtil.isNotBlank(newbornAgeDays)){
+            if (StringUtil.isNotBlank(newbornAgeMonths) && StringUtil.isNotBlank(newbornAgeDays)) {
                 newbornAgeStr = newbornAgeMonths + newbornAgeDays;
                 newbornAgeStr = newbornAgeMonths + newbornAgeDays;
             }
             }
-            if (StringUtil.isNotBlank(newbornAgeStr)){
+            if (StringUtil.isNotBlank(newbornAgeStr)) {
                 newbornAge = removalUnit(newbornAgeStr);
                 newbornAge = removalUnit(newbornAgeStr);
             }
             }
             String admissionAge = beHospitalStructureMap.get(Content.age);
             String admissionAge = beHospitalStructureMap.get(Content.age);
@@ -42,18 +42,16 @@ public class BEH0414 extends QCCatalogue {
                 status.set("0");
                 status.set("0");
                 return;
                 return;
             }
             }
-            String admissAge = "";
             if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
             if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
-                admissAge = admissionAge.substring(0, admissionAge.indexOf("岁"));
+                admissionAge = admissionAge.substring(0, admissionAge.indexOf("岁"));
             }
             }
-            String firstadmissAge = "";
             if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("岁")) {
             if (StringUtil.isNotBlank(firstAdmissionAge) && firstAdmissionAge.contains("岁")) {
-                firstadmissAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("岁"));
+                firstAdmissionAge = firstAdmissionAge.substring(0, firstAdmissionAge.indexOf("岁"));
             }
             }
             // int firstAdmissionAgeNum = removalUnit(firstAdmissionAge);
             // int firstAdmissionAgeNum = removalUnit(firstAdmissionAge);
             // int admissionAgeNum = removalUnit(admissionAge);
             // int admissionAgeNum = removalUnit(admissionAge);
             // 只比较年龄前的数值
             // 只比较年龄前的数值
-            if (!admissAge.equals(firstadmissAge)) {
+            if (!admissionAge.equals(firstAdmissionAge)) {
                 status.set("-1");
                 status.set("-1");
                 return;
                 return;
             }
             }
@@ -68,7 +66,7 @@ public class BEH0414 extends QCCatalogue {
         if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
         if (StringUtil.isNotBlank(admissionAge) && admissionAge.contains("岁")) {
             admissionAge = admissionAge.replaceAll("[岁天]", "");
             admissionAge = admissionAge.replaceAll("[岁天]", "");
         }
         }
-        admissionAge = admissionAge.replaceAll("[^0-9]","");
+        admissionAge = admissionAge.replaceAll("[^0-9]", "");
         if (CatalogueUtil.numbersOnly(admissionAge)) {
         if (CatalogueUtil.numbersOnly(admissionAge)) {
             age = Integer.parseInt(admissionAge);
             age = Integer.parseInt(admissionAge);
         }
         }

+ 2 - 5
trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenConsultationDocTrans.java

@@ -104,11 +104,8 @@ public class XiamenConsultationDocTrans extends ModelDocTrans {
     }
     }
 
 
     private List<String> consultationRecord_keyContrasts = Lists.newArrayList(
     private List<String> consultationRecord_keyContrasts = Lists.newArrayList(
-            "执行情况=会诊情况",
-            "记录日期=会诊申请日期",
-            "签名++++=签名",
-            "病情记录=简要病情",
-            "医师签名=签名"
+            "标题=病历标题",
+            "会诊意见=简要病情"
     );
     );
 
 
 
 

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenCriticallyIllNoticeDocTrans.java

@@ -58,7 +58,8 @@ public class XiamenCriticallyIllNoticeDocTrans extends ModelDocTrans {
 
 
     private List<String> keyContrasts = Lists.newArrayList(
     private List<String> keyContrasts = Lists.newArrayList(
             "临床诊断=当前诊断",
             "临床诊断=当前诊断",
-            "患方签名=患者签名"
+            "患方签名=患者签名",
+            "病历号=住院号"
     );
     );
 
 
 }
 }

+ 2 - 1
trans/src/main/java/com/lantone/qc/trans/xiamen/XiamenOperationDocTrans.java

@@ -181,7 +181,8 @@ public class XiamenOperationDocTrans extends ModelDocTrans {
             "记录者=记录医生",
             "记录者=记录医生",
             "患者手术后情况=患者术后情况",
             "患者手术后情况=患者术后情况",
             "麻醉方法=麻醉方式",
             "麻醉方法=麻醉方式",
-            "时间=记录时间"
+            "时间=记录时间",
+            "病历号=住院号"
     );
     );