Merge branch 'dev/20210326_2.0.2' into test

# Conflicts:
#	doc/031.20210326v2.0.2/qc_initv2.0.2.sql

doc/031.20210326v2.0.2/qc_initv2.0.2.sql

@@ -302,7 +302,6 @@ CREATE TABLE `med_index_result` (
 ) ENGINE=InnoDB AUTO_INCREMENT=1207 DEFAULT CHARSET=utf8;
 
 
-DROP TABLE IF EXISTS `med_index_relevance`;
 CREATE TABLE `med_index_relevance` (
   `id` int(10) NOT NULL AUTO_INCREMENT,
   `index_result_id` int(10) DEFAULT NULL COMMENT '主缓存表id',
@@ -316,6 +315,6 @@ CREATE TABLE `med_index_relevance` (
   `gmt_modified` datetime DEFAULT '1970-01-01 12:00:00' COMMENT '记录修改时间,如果时间是1970年则表示纪录未修改',
   `creator` varchar(60) DEFAULT '0' COMMENT '创建人，0表示无创建人值',
   `modifier` varchar(60) DEFAULT '0' COMMENT '修改人,如果为0则表示纪录未修改',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=6311 DEFAULT CHARSET=utf8;
-
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `index_all` (`relevance_type`,`hospital_id`,`behospital_code`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=345204 DEFAULT CHARSET=utf8;

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -605,10 +605,10 @@ public class ConsoleFacade {
         MedIndexResult medIndexResult = new MedIndexResult();
        List<Map<String, String>> selectOperationNumMap = behospitalInfoFacade.selectOperationNum(filterVO);
         if(ListUtil.isNotEmpty(selectOperationNumMap)) {
-        CopyOnWriteArrayList<String> outHospitalCode = new CopyOnWriteArrayList<>();
-        CopyOnWriteArrayList<String> operationCode = new CopyOnWriteArrayList<>();
-        CopyOnWriteArrayList<String> operationPathologyCode = new CopyOnWriteArrayList<>();
-        CopyOnWriteArrayList<String> antibiosisCode = new CopyOnWriteArrayList<>();
+            Set<String> outHospitalCode = new CopyOnWriteArraySet<>();
+            Set<String> operationCode = new CopyOnWriteArraySet<>();
+            Set<String> operationPathologyCode = new CopyOnWriteArraySet<>();
+            Set<String> antibiosisCode = new CopyOnWriteArraySet<>();
             List<String> adviceVerify = adviceVerify(filterVO);
             Long operationFeeNum = 0L;
             filterVO.setFlagStr("2");
@@ -644,7 +644,7 @@ public class ConsoleFacade {
                         operationCode.add(s);
                     }
                 }
-                if(ListUtil.isNotEmpty(operationCode)) {
+                if(operationCode.size()>0&&operationCode!=null) {
                     operationFeeNum = Long.valueOf(operationCode.size());
                 }
                 //CT人数
@@ -667,7 +667,7 @@ public class ConsoleFacade {
                         operationPathologyCode.add(s);
                     }
                 }
-                if(ListUtil.isNotEmpty(operationPathologyCode)) {
+                if(operationPathologyCode.size()>0&&operationPathologyCode!=null) {
                     operationPathologyFeeNum = Long.valueOf(operationPathologyCode.size());
                 }
                 //细菌培养人数
@@ -684,7 +684,7 @@ public class ConsoleFacade {
                     }
                 }
                 Long antibiosisFeeNum =0L;
-                if(ListUtil.isNotEmpty(antibiosisCode)) {
+                if(antibiosisCode.size()>0&&antibiosisCode!=null) {
                     antibiosisFeeNum = Long.valueOf(antibiosisCode.size());
                 }
                 //恶性肿瘤化学治疗人数
@@ -732,8 +732,8 @@ public class ConsoleFacade {
         MedIndexFilterVO timeVo = new MedIndexFilterVO();
         BeanUtils.copyProperties(filterVO,timeVo);
         timeTrans(timeVo);
-            List<String> rescueCode = new CopyOnWriteArrayList<>();
-            List<String> bloodCode = new CopyOnWriteArrayList<>();
+            Set<String> rescueCode = new CopyOnWriteArraySet<>();
+            Set<String> bloodCode = new CopyOnWriteArraySet<>();
         //指标二十七
 
         //指标十七 医师查房记录
@@ -760,7 +760,7 @@ public class ConsoleFacade {
         medIndexRelevance.setStartDate(filterVO.getStartDate());
         medIndexRelevance.setEndDate(filterVO.getEndDate());
         medIndexRelevance.setGmtCreate(new Date());
-            if(ListUtil.isNotEmpty(outHospitalCode)) {
+            if(outHospitalCode.size()>0&&outHospitalCode!=null) {
                 medIndexRelevance.setRelevanceType(4);
                 for (String Code : outHospitalCode) {
                     medIndexRelevance.setBehospitalCode(Code);
@@ -777,7 +777,7 @@ public class ConsoleFacade {
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
-            if(ListUtil.isNotEmpty(operationCode)) {
+            if(operationCode.size()>0&&operationCode!=null) {
                 medIndexRelevance.setRelevanceType(5);
                 for (String Code : operationCode) {
                     medIndexRelevance.setBehospitalCode(Code);
@@ -798,7 +798,7 @@ public class ConsoleFacade {
                 medIndexRelevanceFacade.save(medIndexRelevance);
             }
         }
-            if(ListUtil.isNotEmpty(operationPathologyCode)) {
+            if(operationPathologyCode.size()>0&&operationPathologyCode!=null) {
                 medIndexRelevance.setRelevanceType(10);
                 for (String Code : operationPathologyCode) {
                     medIndexRelevance.setBehospitalCode(Code);
@@ -812,7 +812,7 @@ public class ConsoleFacade {
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
-            if(ListUtil.isNotEmpty(antibiosisCode)) {
+            if(antibiosisCode.size()>0&&antibiosisCode!=null) {
                 medIndexRelevance.setRelevanceType(12);
                 for (String Code : antibiosisCode) {
                     medIndexRelevance.setBehospitalCode(Code);
@@ -826,28 +826,28 @@ public class ConsoleFacade {
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
-            if(ListUtil.isNotEmpty(operationCode)) {
+            if(operationCode.size()>0&&operationCode!=null) {
                 medIndexRelevance.setRelevanceType(15);
                 for (String Code : operationCode) {
                     medIndexRelevance.setBehospitalCode(Code);
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
-            if(ListUtil.isNotEmpty(bloodCode)) {
+            if(bloodCode.size()>0&&bloodCode!=null) {
                 medIndexRelevance.setRelevanceType(17);
                 for (String Code : bloodCode) {
                     medIndexRelevance.setBehospitalCode(Code);
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
-            if(ListUtil.isNotEmpty(outHospitalCode)) {
+            if(outHospitalCode.size()>0&&outHospitalCode!=null) {
                 medIndexRelevance.setRelevanceType(18);
                 for (String Code : outHospitalCode) {
                     medIndexRelevance.setBehospitalCode(Code);
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
-            if(ListUtil.isNotEmpty(rescueCode)) {
+            if(rescueCode.size()>0&&rescueCode!=null) {
                 medIndexRelevance.setRelevanceType(19);
                 for (String Code : rescueCode) {
                     medIndexRelevance.setBehospitalCode(Code);
@@ -3171,7 +3171,7 @@ public class ConsoleFacade {
      * ==============================后台维护===============================
      */
     //指标十八 抢救记录
-    private  void rescueMethods(List<MedManageParamsDTO> medManageParams,MedIndexResult medIndexResult, List<String> rescueCode){
+    private  void rescueMethods(List<MedManageParamsDTO> medManageParams,MedIndexResult medIndexResult, Set<String> rescueCode){
         List<MedManageParamsDTO> manageList= new ArrayList<>();
         List<String> rescueDrugList = QualityContent.RESCUEDRUGLIST;
         for (int i = 0; i < medManageParams.size(); i++) {
@@ -3194,7 +3194,7 @@ public class ConsoleFacade {
     }
 
     //指标十六  临床用血相关记录符合率
-    private void bloodMethods(List<MedManageParamsDTO> doctorAdviceList, List<MedManageParamsDTO> medManageParams,MedIndexResult medIndexResult, List<String> bloodCode){
+    private void bloodMethods(List<MedManageParamsDTO> doctorAdviceList, List<MedManageParamsDTO> medManageParams,MedIndexResult medIndexResult, Set<String> bloodCode){
         Set<String> manageList= new CopyOnWriteArraySet<>();
         List<String> blood_list = QualityContent.BLOODLIST;
         //lis项目存在用血住院病历号

src/main/java/com/diagbot/mapper/MedPacsResultMapper.java

@@ -17,6 +17,5 @@ import java.util.List;
  */
 public interface MedPacsResultMapper extends BaseMapper<MedPacsResult> {
     public List<MedPacsResultDTO> getMedPacsResults(BehospitalInfo behospitalInfo);
-
     void updateBatchByKey(List<MedPacsResult> list);
 }