Merge branch 'master' into 'master'

医保收入分析趋势图优化

See merge request lighter/web-server!68

src/main/java/thyyxxk/webserver/service/ybkf/YbStatService.java

@@ -22,6 +22,7 @@ import thyyxxk.webserver.utils.StringUtil;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -499,7 +500,7 @@ public class YbStatService {
 
         }
 
-        if (null == ybStatResult || ybStatResult.isEmpty()) {
+        if (ybStatResult.isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }
 
@@ -520,7 +521,7 @@ public class YbStatService {
         String selectType = dto.getSelectType();
 
         String year = beginTime.substring(0,4);
-        int lastYear = Integer.valueOf(year) - 1;
+        int lastYear = Integer.parseInt(year) - 1;
         // 开始月份
         String mouthS = beginTime.startsWith("10", 5) ? "10" : beginTime.substring(5,7).replace("0", "") ;
         int m = Integer.parseInt(mouthS);
@@ -1413,6 +1414,9 @@ public class YbStatService {
             }
         }
 
+        result = result.stream().sorted(
+                Comparator.nullsLast(Comparator.comparing((Map<String, Object> i) -> i.get("yf").toString()))
+            ).collect(Collectors.toList());
         return ResultVoUtil.success(result);
     }
 

src/main/java/thyyxxk/webserver/utils/MedInsTypeUtil.java

@@ -35,9 +35,10 @@ public class MedInsTypeUtil {
 
     static {
         List<String> cssbj = Arrays.asList("430102", "430103", "430104", "430105", "430111", "430112", "430140", "430199");
-        List<String> cssdbz = Arrays.asList("430102", "430103", "430104", "430105", "430111", "430112", "430140", "430199", "430121", "430181");
+        List<String> cssdbz = Arrays.asList("430102", "430103", "430104", "430105", "430111", "430112", "430140", "430199", "430121", "430181", "430182");
         List<String> csxdq = Collections.singletonList("430121");
         List<String> lysdq = Collections.singletonList("430181");
+        List<String> nxsdq = Collections.singletonList("430182");
         List<String> hnsbj = Collections.singletonList("439900");
         List<String> ptzyMedtypes = Arrays.asList("2101", "22");
         List<String> matnMedtypes = Arrays.asList("52", "2106", "2107");
@@ -55,6 +56,10 @@ public class MedInsTypeUtil {
         map.put("浏阳市城居普通住院", new Judge(lysdq, Insutype.BASIC_MEDICAL_INSURANCE_FOR_RURAL_RESIDENTS, ptzyMedtypes));
         map.put("浏阳市离休", new Judge(lysdq, Insutype.MEDICAL_SECURITY_FOR_RETIRED_PERSONNEL, ptzyMedtypes));
         map.put("浏阳市生育", new Judge(lysdq, null, matnMedtypes));
+        map.put("宁乡市城职普通住院", new Judge(nxsdq, Insutype.BASIC_MEDICAL_INSURANCE_FOR_EMPLOYEES, ptzyMedtypes));
+        map.put("宁乡市城居普通住院", new Judge(nxsdq, Insutype.BASIC_MEDICAL_INSURANCE_FOR_RURAL_RESIDENTS, ptzyMedtypes));
+        map.put("宁乡市离休", new Judge(nxsdq, Insutype.MEDICAL_SECURITY_FOR_RETIRED_PERSONNEL, ptzyMedtypes));
+        map.put("宁乡市生育", new Judge(nxsdq, null, matnMedtypes));
         map.put("湖南省城职普通住院", new Judge(hnsbj, Insutype.BASIC_MEDICAL_INSURANCE_FOR_EMPLOYEES, ptzyMedtypes));
         map.put("湖南省城居普通住院", new Judge(hnsbj, Insutype.BASIC_MEDICAL_INSURANCE_FOR_RURAL_RESIDENTS, ptzyMedtypes));
         map.put("湖南省离休", new Judge(hnsbj, Insutype.MEDICAL_SECURITY_FOR_RETIRED_PERSONNEL, ptzyMedtypes));