소스 검색

台州查房模板修改

rengb 5 년 전
부모
커밋
ab914f998a

+ 20 - 10
dbanaly/src/main/java/com/lantone/qc/dbanaly/lt/facade/ModelHospitalFacade.java

@@ -3,7 +3,10 @@ package com.lantone.qc.dbanaly.lt.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lantone.qc.dbanaly.lt.entity.ModelHospital;
 import com.lantone.qc.dbanaly.lt.service.impl.ModelHospitalServiceImpl;
+import com.lantone.qc.dbanaly.util.RedisUtil;
+import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -17,17 +20,24 @@ import java.util.stream.Collectors;
 @Component
 public class ModelHospitalFacade extends ModelHospitalServiceImpl {
 
+    @Autowired
+    private RedisUtil redisUtil;
+
     public List<String> getRecTitles(long hospitalId, long modelId) {
-        QueryWrapper<ModelHospital> qcModelHospitalQe = new QueryWrapper<>();
-        qcModelHospitalQe.eq("hospital_id", hospitalId);
-        qcModelHospitalQe.eq("stand_model_id", modelId);
-        qcModelHospitalQe.select("hospital_model_name");
-        List<String> recTitles = list(qcModelHospitalQe)
-                .stream()
-                .map(i -> i.getHospitalModelName())
-                .filter(i -> StringUtil.isNotBlank(i))
-                .distinct()
-                .collect(Collectors.toList());
+        List<String> recTitles = redisUtil.getJsonStringValue("recTitles");
+        if (ListUtil.isEmpty(recTitles)) {
+            QueryWrapper<ModelHospital> qcModelHospitalQe = new QueryWrapper<>();
+            qcModelHospitalQe.eq("hospital_id", hospitalId);
+            qcModelHospitalQe.eq("stand_model_id", modelId);
+            qcModelHospitalQe.select("hospital_model_name");
+            recTitles = list(qcModelHospitalQe)
+                    .stream()
+                    .map(i -> i.getHospitalModelName())
+                    .filter(i -> StringUtil.isNotBlank(i))
+                    .distinct()
+                    .collect(Collectors.toList());
+            redisUtil.setJsonStringValue("recTitles", recTitles);
+        }
         return recTitles;
     }
 

+ 3 - 4
trans/src/main/java/com/lantone/qc/trans/changx/ChangxThreeLevelWardDocTrans.java

@@ -6,7 +6,6 @@ import com.lantone.qc.dbanaly.facade.changx.CxXmlUtil;
 import com.lantone.qc.dbanaly.lt.facade.ModelHospitalFacade;
 import com.lantone.qc.dbanaly.util.KernelConstants;
 import com.lantone.qc.dbanaly.util.RedisUtil;
-import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationRecordDoc;
@@ -60,9 +59,9 @@ public class ChangxThreeLevelWardDocTrans extends ModelDocTrans {
         Map<String, String> xmlNodeValueMap = CxXmlUtil.firstLevelNodeValue(content);
         xmlNodeValueMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
         String recTitle = contentMap.get("recTitle").toString();
-        //        if (recTitles.contains(recTitle)) {
-        //            xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
-        //        }
+        if (recTitles.contains(recTitle)) {
+            xmlNodeValueMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+        }
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(xmlNodeValueMap, keyContrasts);
         structureMap.put("查房日期", structureMap.get("记录时间"));
 

+ 11 - 1
trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouThreeLevelWardDocTrans.java

@@ -1,11 +1,13 @@
 package com.lantone.qc.trans.taizhou;
 
 import com.google.common.collect.Lists;
+import com.lantone.qc.dbanaly.lt.facade.ModelHospitalFacade;
 import com.lantone.qc.pub.model.doc.ThreeLevelWardDoc;
 import com.lantone.qc.pub.model.doc.ward.AttendingDoctorWardDoc;
 import com.lantone.qc.pub.model.doc.ward.DirectorDoctorWardDoc;
 import com.lantone.qc.pub.model.doc.ward.GeneralDoctorWardDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
+import com.lantone.qc.pub.util.SpringContextUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
@@ -22,8 +24,13 @@ import java.util.Map;
  */
 public class TaiZhouThreeLevelWardDocTrans extends ModelDocTrans {
 
+    private List<String> recTitles;
+
     @Override
     public List<ThreeLevelWardDoc> extract(MedrecVo medrecVo) {
+        ModelHospitalFacade modelHospitalFacade = SpringContextUtil.getBean(ModelHospitalFacade.class);
+        recTitles = modelHospitalFacade.getRecTitles(3l, 4l);
+
         List<ThreeLevelWardDoc> retList = Lists.newArrayList();
         List<Map<String, Object>> contentMaps = (List) medrecVo.getContent().get("content");
 
@@ -39,7 +46,10 @@ public class TaiZhouThreeLevelWardDocTrans extends ModelDocTrans {
         String content = contentMap.get("xmlText").toString();
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content);
         sourceMap.put("mode_id=" + contentMap.get("modeId").toString(), "");
-        sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+        String recTitle = contentMap.get("recTitle").toString();
+        if (recTitles.contains(recTitle)) {
+            sourceMap.put("rec_title=" + contentMap.get("recTitle").toString(), "");
+        }
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
 
         if (StringUtils.isEmpty(structureMap.get("查房日期"))) {