台州修改bug

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0462.java

@@ -24,7 +24,7 @@ public class BEH0462 extends QCCatalogue {
         }
         if (inputInfo.getBeHospitalizedDoc() != null) {
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-            if (StringUtil.isBlank(beHospitalStructureMap.get("心血管疾病"))) {
+            if (StringUtil.isBlank(beHospitalStructureMap.get("心脏病"))) {
                 status.set("-1");
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0467.java

@@ -24,7 +24,7 @@ public class BEH0467 extends QCCatalogue {
         }
         if (inputInfo.getBeHospitalizedDoc() != null) {
             Map<String, String> beHospitalStructureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
-            if (StringUtil.isBlank(beHospitalStructureMap.get("内科疾病史-其它"))) {
+            if (StringUtil.isBlank(beHospitalStructureMap.get("内科疾病史(其它)"))) {
                 status.set("-1");
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0474.java

@@ -24,7 +24,7 @@ public class BEH0474 extends QCCatalogue {
         }
         Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
         if (structureMap != null) {
-            if (CatalogueUtil.isEmpty(structureMap.get("一般情况"))) {
+            if (CatalogueUtil.isEmpty(structureMap.get("既往健康状况"))) {
                 status.set("-1");
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0502.java

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.FirstCourseRecordDoc;
 import com.lantone.qc.pub.model.entity.Lis;
+import com.lantone.qc.pub.model.entity.Pacs;
 import com.lantone.qc.pub.model.label.TreatPlanLabel;
 import org.springframework.stereotype.Component;
 
@@ -25,8 +26,8 @@ public class FIRC0502 extends QCCatalogue {
         FirstCourseRecordDoc firstCourseRecordDoc = inputInfo.getFirstCourseRecordDoc();
         if(firstCourseRecordDoc != null){
             TreatPlanLabel treatPlanLabel = firstCourseRecordDoc.getTreatPlanLabel();
-            List<Lis> lis = treatPlanLabel.getLis();
-            if(lis == null || lis.size() == 0){
+            List<Pacs> pacs = treatPlanLabel.getPacs();
+            if(pacs == null || pacs.size() == 0){
                 status.set("-1");
             }
 

trans/src/main/java/com/lantone/qc/trans/changx/ChangxFirstCourseRecordDocTrans.java

@@ -14,6 +14,8 @@ import com.lantone.qc.trans.comsis.Preproc;
 import java.util.List;
 import java.util.Map;
 
+import static com.lantone.qc.trans.comsis.ModelDocGenerate.structureMapJoin;
+
 /**
  * @Description: 首次病程录文档生成
  * @author: rengb
@@ -40,6 +42,9 @@ public class ChangxFirstCourseRecordDocTrans extends ModelDocTrans {
         FirstCourseRecordDoc firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(cutWordMap);
         firstCourseRecordDoc.setText(text);
         firstCourseRecordDoc.setPageData((Map) cutWordMap);
+        List<String> keys = Lists.newArrayList("需求评估", "预期目标", "诊疗计划", "治疗监测计划");
+        String treatPlanJoin = structureMapJoin(structureMap, keys);
+        firstCourseRecordDoc.getTreatPlanLabel().setAiText(treatPlanJoin);
         return firstCourseRecordDoc;
     }
 

trans/src/main/java/com/lantone/qc/trans/comsis/ModelDocGenerate.java

@@ -365,9 +365,6 @@ public class ModelDocGenerate {
 
         TreatPlanLabel treatPlanLabel = new TreatPlanLabel();
         treatPlanLabel.setText(structureMap.get("诊疗计划"));
-        List<String> keys = Lists.newArrayList("需求评估", "预期目标", "诊疗计划", "治疗监测计划");
-        String treatPlanJoin = structureMapJoin(structureMap, keys);
-        treatPlanLabel.setAiText(treatPlanJoin);
         firstCourseRecordDoc.setTreatPlanLabel(treatPlanLabel);
 //        structureMap.remove("诊疗计划");
 
@@ -460,7 +457,7 @@ public class ModelDocGenerate {
     /**
      * 拼接结构化数据
      **/
-    private static String structureMapJoin(Map<String, String> structureMap, List<String> keys) {
+    public static String structureMapJoin(Map<String, String> structureMap, List<String> keys) {
         String textJoin = "";
         for (String key : keys) {
             if (StringUtil.isNotBlank(structureMap.get(key))) {

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

@@ -13,6 +13,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
+import static com.lantone.qc.trans.comsis.ModelDocGenerate.structureMapJoin;
+
 /**
  * @Description: 首次病程录文档生成
  * @author: rengb
@@ -69,6 +71,9 @@ public class TaiZhouFirstCourseRecordDocTrans extends ModelDocTrans {
         // 诊疗计划
         FirstCourseRecordDoc firstCourseRecordDoc = ModelDocGenerate.firstCourseRecordDocGen(structureMap);
         firstCourseRecordDoc.setPageData((Map) structureMap);
+        List<String> keys = Lists.newArrayList("检查计划", "治疗计划");
+        String treatPlanJoin = structureMapJoin(structureMap, keys);
+        firstCourseRecordDoc.getTreatPlanLabel().setAiText(treatPlanJoin);
         return firstCourseRecordDoc;
     }