Explorar o código

厦门:规则及解析问题更新

wangsy %!s(int64=4) %!d(string=hai) anos
pai
achega
7fed696476

+ 2 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/behospitalized/BEH0378.java

@@ -30,7 +30,8 @@ public class BEH0378 extends QCCatalogue {
         FamilyLabel familyLabel = inputInfo.getBeHospitalizedDoc().getFamilyLabel();
         MaritalLabel maritalLabel = inputInfo.getBeHospitalizedDoc().getMaritalLabel();
 
-        if (familyLabel == null || maritalLabel == null) {
+        if (familyLabel == null || maritalLabel == null ||
+                StringUtil.isBlank(familyLabel.getText()) || StringUtil.isBlank(maritalLabel.getText())) {
             return;
         }
         List<Family> familiesFl = null;

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/firstcourserecord/FIRC0092.java

@@ -45,7 +45,7 @@ public class FIRC0092 extends QCCatalogue {
             findText = true;
         }
         if(treatPlanLabel.getNursingLevel() != null){
-            if (findText && !treatPlanLabel.getNursingLevel().getName().contains("护理常规") &&
+            if (findText && !treatPlanLabel.getNursingLevel().getName().equals("护理常规") &&
                     (treatPlanLabel.getMedicine() != null || treatPlanLabel.getTreat().size() > 0
                             || treatPlanLabel.getPacs().size() > 0)) {
                 status.set("0");
@@ -53,7 +53,7 @@ public class FIRC0092 extends QCCatalogue {
             }
         }
         String message = "";
-        if (treatPlanLabel.getNursingLevel() == null || treatPlanLabel.getNursingLevel().getName().contains("护理常规")) {
+        if (treatPlanLabel.getNursingLevel() == null || treatPlanLabel.getNursingLevel().getName().equals("护理常规")) {
             message += "无护理级别;";
         }
 

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/xiamen/leavehospital/LEA0149.java

@@ -41,7 +41,7 @@ public class LEA0149 extends QCCatalogue {
         if (lhStructureMap != null && chiefLabel != null) {
             String bhChief = CatalogueUtil.int2ChineseNum(chiefLabel.getText().replaceAll("[\\p{Punct}\\pP。-]", ""));
             String leaveChief = lhStructureMap.get("主诉");
-            String bhThings = lhStructureMap.get("入院情况");
+            String bhThings = lhStructureMap.get("病史摘要");
             String reThings = lhStructureMap.get("入院原因");   //邵逸夫主诉在入院原因内
             if (StringUtil.isNotBlank(bhThings)) {
                 bhThings = CatalogueUtil.int2ChineseNum(bhThings.replaceAll("[\\p{Punct}\\pP。-]", ""));

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

@@ -48,8 +48,8 @@ public class XiamenBeHospitalizedDocTrans extends ModelDocTrans {
             "病历日期=病史采集时间",
             "既往史|过敏史=过敏史",
             "医生签名时间=记录时间",
-            "疼痛评估=疼痛",
-            "代诉=主诉",
+            "户口地址=住址",
+            "病历日期=记录日期",
             "病历|体格检查=体格检查"
     );
 

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

@@ -176,7 +176,7 @@ public class XiamenOperationDocTrans extends ModelDocTrans {
 
     private List<String> operationRecord_keyContrasts = Lists.newArrayList(
             "手术经过=手术经过及处理",
-            "术后诊断=术中后诊断",
+            "术(中)后诊断=术中后诊断",
             "主刀=主刀医师",
             "记录者=记录医生",
             "患者手术后情况=患者术后情况",