Merge remote-tracking branch 'origin/test' into test

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

@@ -601,7 +601,7 @@ public class ConsoleFacade {
         Long startCount = selectOperationNumMap.get(QualityContent.DISCHARGED_PATIENTS);
             Long operationFeeNum = 0L;
                 filterVO.setFlagStr("2");
-        List<MedManageParamsDTO> doctorAdviceMedManageParams = behospitalInfoFacade.getMedManageParams(filterVO);
+                 List<MedManageParamsDTO> doctorAdviceMedManageParams = behospitalInfoFacade.getMedManageParams(filterVO);
                 Map<String, Long> adviceNum = getAdviceNum(filterVO,doctorAdviceMedManageParams);
                 //手术人数
                 operationFeeNum = selectOperationNumMap.get("operationFee");
@@ -685,6 +685,9 @@ public class ConsoleFacade {
      * @return
      */
     public String getResult(double i , Double y){
+//        BigDecimal b = new BigDecimal((i * 100.00) / y);
+//        //保留2位小数
+//        double result = b.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
         DecimalFormat df = new DecimalFormat();
         df.setMaximumFractionDigits(2);
         df.setMinimumFractionDigits(2);
@@ -692,6 +695,7 @@ public class ConsoleFacade {
             return "0.00%";
         }
         String k= df.format((i * 100.00) / y) + "%";
+
         return k;
     }
     /**
@@ -906,12 +910,14 @@ public class ConsoleFacade {
             }else {
                 map.put("operation",Long.valueOf(operationBehospitalCode.size()));
             }
-            if(ListUtil.isEmpty(operationBehospitalCode)||ListUtil.isEmpty(operationPathologyBehospitalCode)){
+            if(ListUtil.isEmpty(operationBehospitalCode)||ListUtil.isEmpty(pathologyBehospitalCode)){
                 map.put("operationPathology",Long.valueOf(0));
             }else {
                 for (String operation : operationBehospitalCode) {
-                    if(pathologyBehospitalCode.contains(operation)){
-                        operationPathologyBehospitalCode.add(operation);
+                    for (String pathology : pathologyBehospitalCode) {
+                        if(pathology.equals(operation)){
+                            operationPathologyBehospitalCode.add(operation);
+                        }
                     }
                 }
                 map.put("operationPathology",Long.valueOf(operationPathologyBehospitalCode.size()));