义务基础添加

dbanaly/src/main/java/com/lantone/qc/dbanaly/controller/DbController.java

@@ -6,7 +6,7 @@ import com.lantone.qc.dbanaly.facade.comsis.ModuleHelper;
 import com.lantone.qc.dbanaly.facade.comsis.RedisFacade;
 import com.lantone.qc.dbanaly.facade.shaoyf.ShaoyfXmlDataAnalysisFacade;
 import com.lantone.qc.dbanaly.facade.taizhou.TaiZhouXmlDataAnalysisFacade;
-import com.lantone.qc.dbanaly.util.RedisUtil;
+import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlDataAnalysisFacade;
 import com.lantone.qc.dbanaly.vo.AnalyzeXmlVO;
 import com.lantone.qc.dbanaly.vo.CrfCacheRemoveVO;
 import com.lantone.qc.pub.res.Response;
@@ -41,6 +41,8 @@ public class DbController {
     @Autowired
     private ShaoyfXmlDataAnalysisFacade shaoyfXmlDataAnalysisFacade;
     @Autowired
+    private YiWuXmlDataAnalysisFacade yiWuXmlDataAnalysisFacade;
+    @Autowired
     private RedisFacade redisFacade;
 
     @ApiOperation(value = "模板信息加载")
@@ -61,12 +63,15 @@ public class DbController {
             msgList.addAll(changxXmlDataAnalysisFacade.analyzeXml(analyzeXmlVO.getModeIds()));
             msgList.addAll(shaoyfXmlDataAnalysisFacade.analyzeXml(analyzeXmlVO.getModeIds()));
             msgList.addAll(taiZhouXmlDataAnalysisFacade.analyzeXml(analyzeXmlVO.getModeIds()));
+            msgList.addAll(yiWuXmlDataAnalysisFacade.analyzeXml(analyzeXmlVO.getModeIds()));
         } else if (hospitalId == 1) {
             msgList = changxXmlDataAnalysisFacade.analyzeXml(analyzeXmlVO.getModeIds());
         } else if (hospitalId == 2) {
             msgList = shaoyfXmlDataAnalysisFacade.analyzeXml(analyzeXmlVO.getModeIds());
         } else if (hospitalId == 3) {
             msgList = taiZhouXmlDataAnalysisFacade.analyzeXml(analyzeXmlVO.getModeIds());
+        } else if (hospitalId == 5) {
+            msgList = yiWuXmlDataAnalysisFacade.analyzeXml(analyzeXmlVO.getModeIds());
         }
         response.setData(msgList);
         return response;

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/comsis/ModuleHelper.java

@@ -52,7 +52,7 @@ public class ModuleHelper {
      */
     public boolean loadModuleInfo() {
         try {
-            List<String> xmlDataTypeHospitalIds = Lists.newArrayList("1", "2", "3");
+            List<String> xmlDataTypeHospitalIds = Lists.newArrayList("1", "2", "3", "5");
             List<String> htmlDataTypeHospitalIds = Lists.newArrayList("4");
             for (String hospitalId : hospitalIds.split(",")) {
                 loadStandardModule(hospitalId);

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/comsis/XmlDataAnalysisFacade.java

@@ -7,6 +7,7 @@ import com.google.common.collect.Sets;
 import com.lantone.qc.dbanaly.facade.changx.CxXmlUtil;
 import com.lantone.qc.dbanaly.facade.shaoyf.ShaoyfXmlUtil;
 import com.lantone.qc.dbanaly.facade.taizhou.TzXmlUtil;
+import com.lantone.qc.dbanaly.facade.yiwu.YiWuXmlUtil;
 import com.lantone.qc.dbanaly.lt.entity.Abnormal;
 import com.lantone.qc.dbanaly.lt.entity.BehospitalInfo;
 import com.lantone.qc.dbanaly.lt.entity.MedicalRecord;
@@ -280,11 +281,11 @@ public class XmlDataAnalysisFacade {
         List<Map.Entry<Set<String>, String>> ret = Lists.newArrayList();
 
         QueryWrapper<MedicalRecord> medicalRecordQe = new QueryWrapper<>();
-        medicalRecordQe.eq("hospital_id",hospitalId);
-        medicalRecordQe.in("rec_id",recIds);
+        medicalRecordQe.eq("hospital_id", hospitalId);
+        medicalRecordQe.in("rec_id", recIds);
         MedicalRecord medicalRecord = new MedicalRecord();
         medicalRecord.setStatus(1);
-        medicalRecordService.update(medicalRecord,medicalRecordQe);
+        medicalRecordService.update(medicalRecord, medicalRecordQe);
 
         //根据文书记录id集合，找出文书内容，有的文书记录可能没有对应文书内容，如果文书的xml是加密过的，还需要解密
         QueryWrapper<MedicalRecordContent> medicalRecordContentQe = new QueryWrapper<>();
@@ -334,6 +335,8 @@ public class XmlDataAnalysisFacade {
             keys.addAll(ShaoyfXmlUtil.getXmlToMap(xml).keySet());
         } else if (hospitalId == 3) {
             keys.addAll(TzXmlUtil.getXmlToMapForTZ(xml).keySet());
+        } else if (hospitalId == 5) {
+            keys.addAll(YiWuXmlUtil.xmlToMap(xml).keySet());
         }
         if (keys.size() > 0) {
             if (StringUtil.isNotBlank(sex)) {

dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/yiwu/YiWuXmlDataAnalysisFacade.java

@@ -0,0 +1,51 @@
+package com.lantone.qc.dbanaly.facade.yiwu;
+
+import com.google.common.collect.Lists;
+import com.lantone.qc.dbanaly.facade.comsis.XmlDataAnalysisFacade;
+import com.lantone.qc.dbanaly.lt.facade.ModeFacade;
+import com.lantone.qc.pub.util.ListUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2020/6/3 16:44
+ */
+@Slf4j
+@Component
+public class YiWuXmlDataAnalysisFacade {
+    @Autowired
+    private XmlDataAnalysisFacade xmlDataAnalysisFacade;
+    @Autowired
+    private ModeFacade modeFacade;
+
+    public List<String> analyzeXml(List<Long> modeIds) {
+        List<String> retList = Lists.newArrayList();
+        if (ListUtil.isEmpty(modeIds)) {
+            modeIds = Arrays.asList(1l, 2l, 3l, 4l, 5l, 7l, 8l, 9l, 10l, 11l, 17l, 18l, 19l, 22l, 23l, 24l, 25l, 26l, 27l, 28l, 29l, 30l, 31l, 32l, 34l, 35l);
+        }
+        Map<Long, String> modeMap = modeFacade.getModeMap();
+        List<String> recTitles = null;
+        String modeName = null;
+        for (Long modeId : modeIds) {
+            recTitles = xmlDataAnalysisFacade.getRecTitles(5l, modeId);
+            modeName = modeMap.get(modeId);
+            for (String recTitle : recTitles) {
+                try {
+                    xmlDataAnalysisFacade.analysisByRecTitle(5l, modeId, modeName, recTitle, null, "");
+                } catch (Exception e) {
+                    retList.add("[台州-" + modeId + "-" + recTitle + "]执行失败");
+                    log.error("[台州-" + modeId + "-" + recTitle + "]执行失败--" + e.getMessage(), e);
+                }
+            }
+        }
+        return retList;
+    }
+
+}

kernel/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
     active: local
 
 qc:
-  hospital_id: 4
+  hospital_id: 4,5
 
 logging:          # 日志
   config: classpath:logback-spring.xml