Merge branch 'master' into 'master'

增加宁乡医保的病人

See merge request lighter/web-server!37

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

@@ -292,6 +292,40 @@ public class YbStatService {
                 }
             }
 
+            insuplcAdmdvs.clear();
+            insurtype.clear();
+            med_type.clear();
+            if("43018231001".equals(insurType) || "99".equals(insurType)){
+                // 宁乡市城职普通住院(包含外伤住院)
+                insuplcAdmdvs.add("430182");
+                insurtype.add("310");
+                med_type.add("2101");
+                med_type.add("22");
+                YbStatResult result = dao.selectYbStatInfo(beginTime, endTime, setlType, insuplcAdmdvs, insurtype, med_type);
+                if(!ObjectUtils.isEmpty(result) && result.getPsnCount() > 0){
+                    result.setInsurName("宁乡市城职普通住院");
+                    result.setInsurType("99".equals(insurType) ? "43018231001" : insurType);
+                    ybStatResult.add(result);
+                }
+            }
+
+            insuplcAdmdvs.clear();
+            insurtype.clear();
+            med_type.clear();
+            if("43018239001".equals(insurType) || "99".equals(insurType)){
+                // 宁乡市城居普通住院(包含外伤住院)
+                insuplcAdmdvs.add("430182");
+                insurtype.add("390");
+                med_type.add("2101");
+                med_type.add("22");
+                YbStatResult result = dao.selectYbStatInfo(beginTime, endTime, setlType, insuplcAdmdvs, insurtype, med_type);
+                if(!ObjectUtils.isEmpty(result) && result.getPsnCount() > 0){
+                    result.setInsurName("宁乡市城居普通住院");
+                    result.setInsurType("99".equals(insurType) ? "43018239001" : insurType);
+                    ybStatResult.add(result);
+                }
+            }
+
             insuplcAdmdvs.clear();
             insurtype.clear();
             med_type.clear();