code去重

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

@@ -623,7 +623,7 @@ public class ConsoleFacade {
             Long operationFeeNum = 0L;
             filterVO.setFlagStr("2");
             List<MedManageParamsDTO> doctorAdviceMedManageParams = behospitalInfoFacade.getMedManageParams(filterVO);
-            Map<String, List<String>> adviceNum = getAdviceNum(filterVO, doctorAdviceMedManageParams);
+         Map<String, Set<String>> adviceNum = getAdviceNum(filterVO, doctorAdviceMedManageParams);
         if(ListUtil.isNotEmpty(selectOperationNumMap)) {
             for (Map<String, String> stringStringMap : selectOperationNumMap) {
                 String behospitalCode = stringStringMap.get("behospitalCode");
@@ -650,8 +650,8 @@ public class ConsoleFacade {
                 }
             Long startCount = Long.valueOf(outHospitalCode.size());
             //手术人
-                List<String> operationList = adviceNum.get("operation");
-                if(ListUtil.isNotEmpty(operationList)){
+                Set<String> operationList = adviceNum.get("operation");
+                if(operationList!=null&&operationList.size()>0){
                     for (String s : operationList) {
                         operationCode.add(s);
                     }
@@ -660,21 +660,21 @@ public class ConsoleFacade {
                     operationFeeNum = Long.valueOf(operationCode.size());
                 }
                 //CT人数
-                List<String> ctList = adviceNum.get("CT");
+                  Set<String> ctList = adviceNum.get("CT");
                 Long CTNum=0L;
-                if(ListUtil.isNotEmpty(ctList)) {
+                if(ctList!=null&&ctList.size()>0) {
                     CTNum = Long.valueOf(ctList.size());
                 }
                 //MR人数
-                List<String> mrList = adviceNum.get("MR");
+                  Set<String> mrList = adviceNum.get("MR");
                 Long MRNum=0L;
-                if(ListUtil.isNotEmpty(mrList)) {
+                if(mrList!=null&&mrList.size()>0) {
                     MRNum = Long.valueOf(mrList.size());
                 }
                 //手术病理人数
                 Long operationPathologyFeeNum=0L;
-                List<String> operationPathologyList = adviceNum.get("operationPathology");
-                if(ListUtil.isNotEmpty(operationPathologyList)){
+                   Set<String> operationPathologyList = adviceNum.get("operationPathology");
+                if(operationPathologyList!=null&&operationPathologyList.size()>0){
                     for (String s : operationPathologyList) {
                         operationPathologyCode.add(s);
                     }
@@ -683,14 +683,14 @@ public class ConsoleFacade {
                     operationPathologyFeeNum = Long.valueOf(operationPathologyCode.size());
                 }
                 //细菌培养人数
-                List<String> bacterialCultureList = adviceNum.get("bacterialCulture");
+                  Set<String> bacterialCultureList = adviceNum.get("bacterialCulture");
                 Long bacterialCultureNum=0L;
-                if(ListUtil.isNotEmpty(bacterialCultureList)) {
+                if(bacterialCultureList!=null&&bacterialCultureList.size()>0) {
                     bacterialCultureNum = Long.valueOf(bacterialCultureList.size());
                 }
                 //抗菌药物人数
-                List<String> antibiosisList = adviceNum.get("antibiosis");
-                if(ListUtil.isNotEmpty(antibiosisList)) {
+                  Set<String> antibiosisList = adviceNum.get("antibiosis");
+                if(antibiosisList!=null&&antibiosisList.size()>0) {
                     for (String s : antibiosisList) {
                         antibiosisCode.add(s);
                     }
@@ -700,9 +700,9 @@ public class ConsoleFacade {
                     antibiosisFeeNum = Long.valueOf(antibiosisCode.size());
                 }
                 //恶性肿瘤化学治疗人数
-                List<String> chemotherapyMalignantTumorsList = adviceNum.get("chemotherapyMalignantTumors");
+                Set<String> chemotherapyMalignantTumorsList = adviceNum.get("chemotherapyMalignantTumors");
                 Long chemotherapyMalignantTumorsNum =0L;
-                if(ListUtil.isNotEmpty(chemotherapyMalignantTumorsList)) {
+                if(operationList!=null&&operationList.size()>0) {
                     chemotherapyMalignantTumorsNum=   Long.valueOf(chemotherapyMalignantTumorsList.size());
                 }
                 //出院人数
@@ -794,14 +794,14 @@ public class ConsoleFacade {
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
-        if(ListUtil.isNotEmpty(ctList)) {
+        if(ctList!=null&&ctList.size()>0) {
             medIndexRelevance.setRelevanceType(8);
             for (String CTCode : ctList) {
                 medIndexRelevance.setBehospitalCode(CTCode);
                 medIndexRelevanceFacade.save(medIndexRelevance);
             }
         }
-        if(ListUtil.isNotEmpty(mrList)) {
+        if(mrList!=null&&mrList.size()>0) {
             medIndexRelevance.setRelevanceType(9);
             for (String MrCode : mrList) {
                 medIndexRelevance.setBehospitalCode(MrCode);
@@ -815,7 +815,7 @@ public class ConsoleFacade {
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
-            if(ListUtil.isNotEmpty(bacterialCultureList)) {
+            if(bacterialCultureList!=null&&bacterialCultureList.size()>0) {
                 medIndexRelevance.setRelevanceType(11);
                 for (String Code : bacterialCultureList) {
                     medIndexRelevance.setBehospitalCode(Code);
@@ -829,7 +829,7 @@ public class ConsoleFacade {
                     medIndexRelevanceFacade.save(medIndexRelevance);
                 }
             }
-            if(ListUtil.isNotEmpty(chemotherapyMalignantTumorsList)) {
+            if(chemotherapyMalignantTumorsList!=null&&chemotherapyMalignantTumorsList.size()>0) {
                 medIndexRelevance.setRelevanceType(13);
                 for (String Code : chemotherapyMalignantTumorsList) {
                     medIndexRelevance.setBehospitalCode(Code);
@@ -944,18 +944,18 @@ public class ConsoleFacade {
     /**
      * 遍历医嘱信息存入相关数据
      */
-    public Map<String,List<String>> getAdviceNum(FilterVO filterVO, List<MedManageParamsDTO> doctorAdviceMedManageParamsList) {
+    public Map<String,Set<String>> getAdviceNum(FilterVO filterVO, List<MedManageParamsDTO> doctorAdviceMedManageParamsList) {
         CopyOnWriteArrayList<MedManageParamsDTO> doctorAdviceMedManageParams = new CopyOnWriteArrayList<>(doctorAdviceMedManageParamsList);
         String indexName = filterVO.getIndexName();
         Map mapCode = new HashMap<String,List<String>>();
-        List<String> CTBehospitalCode = new CopyOnWriteArrayList<>();
-        List<String> operationPathologyBehospitalCode = new CopyOnWriteArrayList<>();
-        List<String> MRBehospitalCode = new CopyOnWriteArrayList<>();
-        List<String> operationBehospitalCode = new CopyOnWriteArrayList<>();
-        List<String> pathologyBehospitalCode = new CopyOnWriteArrayList<>();
-        List<String> bacterialCultureCode = new CopyOnWriteArrayList<>();
-        List<String> antibiosisBehospitalCode = new CopyOnWriteArrayList<>();
-        List<String> chemotherapyMalignantTumorsBehospitalCode = new CopyOnWriteArrayList<>();
+        Set<String> CTBehospitalCode = new CopyOnWriteArraySet<>();
+        Set<String> operationPathologyBehospitalCode = new CopyOnWriteArraySet<>();
+        Set<String> MRBehospitalCode = new CopyOnWriteArraySet<>();
+        Set<String> operationBehospitalCode = new CopyOnWriteArraySet<>();
+        Set<String> pathologyBehospitalCode = new CopyOnWriteArraySet<>();
+        Set<String> bacterialCultureCode = new CopyOnWriteArraySet<>();
+        Set<String> antibiosisBehospitalCode = new CopyOnWriteArraySet<>();
+        Set<String> chemotherapyMalignantTumorsBehospitalCode = new CopyOnWriteArraySet<>();
         //无首页code
         List<String> behospitalCodeList = adviceVerify(filterVO);
         //首页为肿瘤code
@@ -1087,22 +1087,22 @@ public class ConsoleFacade {
         }finally {
             myPool.shutdown();
 
-            if(ListUtil.isEmpty(CTBehospitalCode)){
+            if(CTBehospitalCode!=null && CTBehospitalCode.size()>0){
                 mapCode.put("CT",null);
             }else {
                 mapCode.put("CT",CTBehospitalCode);
             }
-            if(ListUtil.isEmpty(MRBehospitalCode)){
+            if(MRBehospitalCode!=null && MRBehospitalCode.size()>0){
                 mapCode.put("MR",null);
             }else {
                 mapCode.put("MR",MRBehospitalCode);
             }
-            if(ListUtil.isEmpty(operationBehospitalCode)){
+            if(operationBehospitalCode!=null && operationBehospitalCode.size()>0){
                 mapCode.put("operation",null);
             }else {
                 mapCode.put("operation",operationBehospitalCode);
             }
-            if(ListUtil.isEmpty(operationBehospitalCode)||ListUtil.isEmpty(operationPathologyBehospitalCode)){
+            if((operationBehospitalCode==null)||(operationPathologyBehospitalCode!=null&&operationPathologyBehospitalCode.size()>0)){
                 mapCode.put("operationPathology",null);
             }else {
                 for (String operation : operationBehospitalCode) {
@@ -1112,17 +1112,17 @@ public class ConsoleFacade {
                 }
                 mapCode.put("operationPathology",operationBehospitalCode);
             }
-            if(ListUtil.isEmpty(bacterialCultureCode)){
+            if(bacterialCultureCode!=null && bacterialCultureCode.size()>0){
                 mapCode.put("bacterialCulture",null);
             }else {
                 mapCode.put("bacterialCulture",bacterialCultureCode);
             }
-            if(ListUtil.isEmpty(antibiosisBehospitalCode)){
+            if(antibiosisBehospitalCode!=null && antibiosisBehospitalCode.size()>0){
                 mapCode.put("antibiosis",null);
             }else {
                 mapCode.put("antibiosis",antibiosisBehospitalCode);
             }
-            if(ListUtil.isEmpty(chemotherapyMalignantTumorsBehospitalCode)){
+            if(antibiosisBehospitalCode!=null && antibiosisBehospitalCode.size()>0){
                 mapCode.put("chemotherapyMalignantTumors",null);
             }else {
                 mapCode.put("chemotherapyMalignantTumors",antibiosisBehospitalCode);