jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit d310634e28d39560ec601f06a2a88a0d683c5292

Authored by liquanyu
1 parent f42c975949
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 6 changed files with 242 additions and 36 deletions

platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml View file @ d310634
... ... @@ -1524,7 +1524,7 @@
1524 1524  
1525 1525 <select id="getColorGreenCounts" resultType="java.util.Map" parameterType="java.util.Map">
1526 1526  
1527   - select count(l.sourceId) as colorVioletCount,o.name as hospitalName,o.id as hospitalId
  1527 + select count(l.sourceId) as colorGreenCount,o.name as hospitalName,o.id as hospitalId
1528 1528 from (select p.patientId from report_patients p
1529 1529 where p.type=1 and p.enable is NULL
1530 1530 <if test="hospitalId != null and hospitalId != ''">
... ... @@ -1883,7 +1883,7 @@
1883 1883  
1884 1884 </select>
1885 1885 <select id="getMatDeliverRiskPersonCounts" resultType="java.util.Map" parameterType="java.util.Map">
1886   - select count(DISTINCT(l.sourceId))as riskPersonCount,o.id as hospitalId,o.name as hospitalName
  1886 + select count(DISTINCT(l.sourceId))as matDeliverRiskPersonCount,o.id as hospitalId,o.name as hospitalName
1887 1887 from (select p.patientId from report_patients p
1888 1888 where p.type=3 and p.enable is NULL
1889 1889 <if test="hospitalId != null and hospitalId != ''">
platform-dal/src/main/java/com/lyms/platform/query/BabyCheckModelQuery.java View file @ d310634
... ... @@ -87,7 +87,16 @@
87 87  
88 88 private Date modifiedStart;
89 89 private Date modifiedEnd;
  90 + private Integer highRisk;
90 91  
  92 + public Integer getHighRisk() {
  93 + return highRisk;
  94 + }
  95 +
  96 + public void setHighRisk(Integer highRisk) {
  97 + this.highRisk = highRisk;
  98 + }
  99 +
91 100 public Date getModifiedStart() {
92 101 return modifiedStart;
93 102 }
... ... @@ -152,6 +161,9 @@
152 161  
153 162 if(null!=buildId){
154 163 condition=condition.and("buildId", buildId, MongoOper.IS);
  164 + }
  165 + if(null!=highRisk){
  166 + condition=condition.and("highRisk", highRisk, MongoOper.IS);
155 167 }
156 168 if(null!=hospitalId){
157 169 condition=condition.and("hospitalId", hospitalId, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ d310634
... ... @@ -4206,7 +4206,7 @@
4206 4206 @ResponseBody
4207 4207 @RequestMapping(value = "/syncPatients", method = RequestMethod.GET)
4208 4208 public String syncPatients(@RequestParam(required = false) Date startDate,@RequestParam(required = false) Date endDate) {
4209   - patientSyncMysqlFacade.syncPatients(startDate,endDate);
  4209 + patientSyncMysqlFacade.syncPatients(startDate, endDate);
4210 4210 return "success";
4211 4211 }
4212 4212  
... ... @@ -4476,6 +4476,27 @@
4476 4476 premaritalCheckupFacade.setNumCode(checkup);
4477 4477 return checkup.getNumCode()+"";
4478 4478 }
  4479 +
  4480 +
  4481 + @Autowired
  4482 + private AntExRecordFacade antExRecordFacade;
  4483 +
  4484 +
  4485 + @RequestMapping(value = "/syncLpRiskTo", method = RequestMethod.GET)
  4486 + @ResponseBody
  4487 + public String syncLpRiskTo(Date startDate,Date endDate) {
  4488 + antExRecordFacade.syncLpRiskTo(startDate,endDate);
  4489 + return "";
  4490 + }
  4491 +
  4492 +
  4493 + @RequestMapping(value = "/syncBabyRiskInfo", method = RequestMethod.GET)
  4494 + @ResponseBody
  4495 + public String syncBabyRiskInfo(Date startDate,Date endDate) {
  4496 + babyCheckFacade.syncBabyRiskInfo(startDate, endDate);
  4497 + return "";
  4498 + }
  4499 +
4479 4500  
4480 4501  
4481 4502  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ d310634
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.result.BaseObjectResponse;
9 9 import com.lyms.platform.common.result.BaseResponse;
10 10 import com.lyms.platform.common.utils.*;
  11 +import com.lyms.platform.common.utils.StringUtils;
11 12 import com.lyms.platform.operate.web.request.AntExAddRequest;
12 13 import com.lyms.platform.operate.web.request.AntExManagerQueryRequest;
13 14 import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest;
... ... @@ -28,6 +29,7 @@
28 29 import com.mongodb.BasicDBObject;
29 30 import net.sourceforge.pinyin4j.PinyinHelper;
30 31 import org.apache.commons.collections.CollectionUtils;
  32 +import org.apache.commons.lang.*;
31 33 import org.apache.commons.lang.math.NumberUtils;
32 34 import org.springframework.beans.factory.annotation.Autowired;
33 35 import org.springframework.beans.factory.annotation.Qualifier;
... ... @@ -106,6 +108,15 @@
106 108 @Autowired
107 109 @Qualifier("cfCheckItemService")
108 110 private CheckItemService checkItemService;
  111 + public static final Map<String,Integer> RISK_LEVEL = new HashMap<>();
  112 + static
  113 + {
  114 + RISK_LEVEL.put("risk_green",0);
  115 + RISK_LEVEL.put("risk_orange",1);
  116 + RISK_LEVEL.put("risk_yellow",2);
  117 + RISK_LEVEL.put("risk_red", 3);
  118 + RISK_LEVEL.put("risk_purple", 4);
  119 + }
109 120  
110 121  
111 122 /**
... ... @@ -2313,6 +2324,108 @@
2313 2324 }
2314 2325 }
2315 2326 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(data).setErrormsg("ๆˆๅŠŸ");
  2327 + }
  2328 +
  2329 + /**
  2330 + * ๅŒๆญฅๆปฆๅนณ็š„้ซ˜ๅฑๅˆฐhis
  2331 + */
  2332 + public void syncLpRisk()
  2333 + {
  2334 + Date startDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00");
  2335 + Date endDate = DateUtil.addDay(startDate, 1);
  2336 + syncLpRiskTo(startDate, endDate);
  2337 + }
  2338 +
  2339 +
  2340 + public void syncLpRiskTo(Date startDate,Date endDate)
  2341 + {
  2342 + AntExRecordQuery antExRecordQuery = new AntExRecordQuery();
  2343 + antExRecordQuery.setModifiedStart(startDate);
  2344 + antExRecordQuery.setModifiedEnd(endDate);
  2345 + antExRecordQuery.setHospitalId("2100001377");
  2346 + List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created");
  2347 + if (CollectionUtils.isNotEmpty(antExRecordModelList))
  2348 + {
  2349 + for (AntExRecordModel antExRecordModel : antExRecordModelList)
  2350 + {
  2351 + String parentId = antExRecordModel.getParentId();
  2352 + Patients pat = patientsService.findOnePatientById(parentId);
  2353 + if (pat != null)
  2354 + {
  2355 + Map data = new HashMap();
  2356 + data.put("cardNo",pat.getCardNo());
  2357 + data.put("userName",pat.getUsername());
  2358 + data.put("phone",pat.getPhone());
  2359 + data.put("vcCardNo",pat.getVcCardNo());
  2360 + data.put("checkTime",DateUtil.getyyyy_MM_dd(antExRecordModel.getCheckTime()));
  2361 + data.put("riskScore",antExRecordModel.gethScore());
  2362 + List<Map> risks = new ArrayList<>();
  2363 +
  2364 + //็ฑปๅž‹ 1 ๅค่ฏŠ 2 ๅˆ่ฏŠ
  2365 + if (antExRecordModel.getType() == 2)
  2366 + {
  2367 + AntExChuQuery antExChuQuery = new AntExChuQuery();
  2368 + antExChuQuery.setId(antExRecordModel.getfId());
  2369 + List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
  2370 + if (CollectionUtils.isNotEmpty(antExChuModels))
  2371 + {
  2372 +
  2373 + AntExChuModel antExChuModel = antExChuModels.get(0);
  2374 + Map riskObj = new HashMap();
  2375 + getRisk(antExChuModel.getHighrisk(), antExChuModel.getOtherHighRisk(), riskObj);
  2376 + if (riskObj != null && riskObj.get("highRisk") != null)
  2377 + {
  2378 + List<Map<String,Object>> allRisks = (List <Map <String, Object>>)riskObj.get("highRisk");
  2379 + if (CollectionUtils.isNotEmpty(allRisks))
  2380 + {
  2381 + for (Map<String,Object> map : allRisks)
  2382 + {
  2383 + Map risk = new HashMap();
  2384 + risk.put("riskName", map.get("name"));
  2385 + risk.put("riskLevel", RISK_LEVEL.get(map.get("color")));
  2386 + risks.add(risk);
  2387 + }
  2388 + }
  2389 + }
  2390 + }
  2391 + }
  2392 + else
  2393 + {
  2394 + AntExQuery antExQuery = new AntExQuery();
  2395 + antExQuery.setId(antExRecordModel.getfId());
  2396 + List<AntenatalExaminationModel> antenatalExaminationModels = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
  2397 + if (CollectionUtils.isNotEmpty(antenatalExaminationModels))
  2398 + {
  2399 + AntenatalExaminationModel antenatalExaminationModel = antenatalExaminationModels.get(0);
  2400 + Map riskObj = new HashMap();
  2401 + getRisk(antenatalExaminationModel.getRiskFactor(), antenatalExaminationModel.getOtherRisk(), riskObj);
  2402 + if (riskObj != null && riskObj.get("highRisk") != null)
  2403 + {
  2404 + List<Map<String,Object>> allRisks = (List <Map <String, Object>>)riskObj.get("highRisk");
  2405 + if (CollectionUtils.isNotEmpty(allRisks))
  2406 + {
  2407 + for (Map<String,Object> map : allRisks)
  2408 + {
  2409 + Map risk = new HashMap();
  2410 + risk.put("riskName", map.get("name"));
  2411 + risk.put("riskLevel", RISK_LEVEL.get(map.get("color")));
  2412 + risks.add(risk);
  2413 + }
  2414 + }
  2415 + }
  2416 + }
  2417 +
  2418 + }
  2419 +
  2420 + if (!CollectionUtils.isNotEmpty(risks))
  2421 + {
  2422 + continue;
  2423 + }
  2424 + data.put("risks",risks);
  2425 + System.out.println(JsonUtil.obj2Str(data));
  2426 + }
  2427 + }
  2428 + }
2316 2429 }
2317 2430 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ d310634
... ... @@ -3918,5 +3918,65 @@
3918 3918 smsConfigFacade.saveMsg(messages, babyModel.getHospitalId());
3919 3919 }
3920 3920 }
  3921 +
  3922 +
  3923 + public void syncBabyRiskToLp()
  3924 + {
  3925 + Date startDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd(new Date()) + " 00:00:00");
  3926 + Date endDate = DateUtil.addDay(startDate, 1);
  3927 + syncBabyRiskInfo(startDate, endDate);
  3928 + }
  3929 +
  3930 + public void syncBabyRiskInfo(Date startDate,Date endDate)
  3931 + {
  3932 +
  3933 + BabyCheckModelQuery query = new BabyCheckModelQuery();
  3934 + query.setModifiedStart(startDate);
  3935 + query.setModifiedEnd(endDate);
  3936 + query.setHospitalId("2100001377");
  3937 + query.setHighRisk(1);
  3938 + List<BabyCheckModel> models = babyCheckService.queryBabyCheckRecord(query);
  3939 + {
  3940 + if (CollectionUtils.isNotEmpty(models))
  3941 + {
  3942 + for (BabyCheckModel babyCheckModel : models)
  3943 + {
  3944 + BabyModel babyModel = babyService.getOneBabyById(babyCheckModel.getBuildId());
  3945 + if (babyModel != null)
  3946 + {
  3947 + Map data = new HashMap();
  3948 + data.put("mommyCardNo",babyModel.getMcertNo());
  3949 + data.put("mommyName",babyModel.getMname());
  3950 + data.put("mommyPhone",babyModel.getMphone());
  3951 + data.put("babyName",babyModel.getName());
  3952 + data.put("babySex",SexEnum.getTextById(babyModel.getSex()));
  3953 + data.put("babyBirth",DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
  3954 + data.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate()));
  3955 + data.put("vcCardNo", babyModel.getVcCardNo());
  3956 + List<String> risks = new ArrayList<>();
  3957 + List<String> hightRisks = babyCheckModel.getHighRiskInfo();
  3958 + if (CollectionUtils.isNotEmpty(hightRisks))
  3959 + {
  3960 + List <Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(babyCheckModel.getHighRiskInfo());
  3961 + if (CollectionUtils.isNotEmpty(highRiskInfos))
  3962 + {
  3963 + for (Map map : highRiskInfos)
  3964 + {
  3965 + risks.add(String.valueOf(map.get("name")));
  3966 + }
  3967 + }
  3968 + }
  3969 +
  3970 + if (CollectionUtils.isEmpty(risks))
  3971 + {
  3972 + continue;
  3973 + }
  3974 + data.put("risks",risks);
  3975 + System.out.println(JsonUtil.obj2Str(data));
  3976 + }
  3977 + }
  3978 + }
  3979 + }
  3980 + }
3921 3981 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java View file @ d310634
... ... @@ -1797,7 +1797,7 @@
1797 1797 String orgCheckNumCount = "0";
1798 1798 if (CollectionUtils.isNotEmpty(orgCheckNumCounts)) {
1799 1799 for (Map<String, String> checkData : orgCheckNumCounts) {
1800   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1800 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1801 1801 orgCheckNumCount = String.valueOf(checkData.get("orgCheckNumCount"));
1802 1802 break;
1803 1803 }
... ... @@ -1809,7 +1809,7 @@
1809 1809 String riskPersonCount = "0";
1810 1810 if (CollectionUtils.isNotEmpty(riskPersonCounts)) {
1811 1811 for (Map<String, String> checkData : riskPersonCounts) {
1812   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1812 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1813 1813 riskPersonCount = String.valueOf(checkData.get("riskPersonCount"));
1814 1814 break;
1815 1815 }
... ... @@ -1821,7 +1821,7 @@
1821 1821 String colorYellowCount = "0";
1822 1822 if (CollectionUtils.isNotEmpty(colorYellowCounts)) {
1823 1823 for (Map<String, String> checkData : colorYellowCounts) {
1824   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1824 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1825 1825 colorYellowCount = String.valueOf(checkData.get("colorYellowCount"));
1826 1826 break;
1827 1827 }
... ... @@ -1833,7 +1833,7 @@
1833 1833 String colorOrangeCount = "0";
1834 1834 if (CollectionUtils.isNotEmpty(colorOrangeCounts)) {
1835 1835 for (Map<String, String> checkData : colorOrangeCounts) {
1836   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1836 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1837 1837 colorOrangeCount = String.valueOf(checkData.get("colorOrangeCount"));
1838 1838 break;
1839 1839 }
... ... @@ -1845,7 +1845,7 @@
1845 1845 String colorRedCount = "0";
1846 1846 if (CollectionUtils.isNotEmpty(colorRedCounts)) {
1847 1847 for (Map<String, String> checkData : colorRedCounts) {
1848   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1848 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1849 1849 colorRedCount = String.valueOf(checkData.get("colorRedCount"));
1850 1850 break;
1851 1851 }
... ... @@ -1856,7 +1856,7 @@
1856 1856 String colorVioletCount = "0";
1857 1857 if (CollectionUtils.isNotEmpty(colorVioletCounts)) {
1858 1858 for (Map<String, String> checkData : colorVioletCounts) {
1859   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1859 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1860 1860 colorVioletCount = String.valueOf(checkData.get("colorVioletCount"));
1861 1861 break;
1862 1862 }
... ... @@ -1867,7 +1867,7 @@
1867 1867 String colorGreenCount = "0";
1868 1868 if (CollectionUtils.isNotEmpty(colorGreenCounts)) {
1869 1869 for (Map<String, String> checkData : colorGreenCounts) {
1870   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1870 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1871 1871 colorGreenCount = String.valueOf(checkData.get("colorGreenCount"));
1872 1872 break;
1873 1873 }
... ... @@ -1878,7 +1878,7 @@
1878 1878 String oneRiskCount = "0";
1879 1879 if (CollectionUtils.isNotEmpty(oneRiskCounts)) {
1880 1880 for (Map<String, String> checkData : oneRiskCounts) {
1881   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1881 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1882 1882 oneRiskCount = String.valueOf(checkData.get("oneRiskCount"));
1883 1883 break;
1884 1884 }
... ... @@ -1889,7 +1889,7 @@
1889 1889 String twoRiskCount = "0";
1890 1890 if (CollectionUtils.isNotEmpty(twoRiskCounts)) {
1891 1891 for (Map<String, String> checkData : twoRiskCounts) {
1892   - if (hospitalName.equals(checkData.get("hospitalId"))) {
  1892 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1893 1893 twoRiskCount = String.valueOf(checkData.get("twoRiskCount"));
1894 1894 break;
1895 1895 }
... ... @@ -1900,7 +1900,7 @@
1900 1900 String threeRiskCount = "0";
1901 1901 if (CollectionUtils.isNotEmpty(threeRiskCounts)) {
1902 1902 for (Map<String, String> checkData : threeRiskCounts) {
1903   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1903 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1904 1904 threeRiskCount = String.valueOf(checkData.get("threeRiskCount"));
1905 1905 break;
1906 1906 }
... ... @@ -1912,7 +1912,7 @@
1912 1912 String fourRiskCount = "0";
1913 1913 if (CollectionUtils.isNotEmpty(fourRiskCounts)) {
1914 1914 for (Map<String, String> checkData : fourRiskCounts) {
1915   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1915 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1916 1916 fourRiskCount = String.valueOf(checkData.get("fourRiskCount"));
1917 1917 break;
1918 1918 }
... ... @@ -1974,7 +1974,7 @@
1974 1974 String beforeBuildCheckPersonCount = "0";
1975 1975 if (CollectionUtils.isNotEmpty(beforeBuildCheckPersonCounts)) {
1976 1976 for (Map<String, String> checkData : beforeBuildCheckPersonCounts) {
1977   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1977 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1978 1978 beforeBuildCheckPersonCount = String.valueOf(checkData.get("beforeBuildCheckPersonCount"));
1979 1979 break;
1980 1980 }
... ... @@ -1986,7 +1986,7 @@
1986 1986 String checkRiskPersonCount = "0";
1987 1987 if (CollectionUtils.isNotEmpty(checkRiskPersonCounts)) {
1988 1988 for (Map<String, String> checkData : checkRiskPersonCounts) {
1989   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  1989 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
1990 1990 checkRiskPersonCount = String.valueOf(checkData.get("checkRiskPersonCount"));
1991 1991 break;
1992 1992 }
... ... @@ -1998,7 +1998,7 @@
1998 1998 String checkColorYellowCount = "0";
1999 1999 if (CollectionUtils.isNotEmpty(checkColorYellowCounts)) {
2000 2000 for (Map<String, String> checkData : checkColorYellowCounts) {
2001   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2001 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2002 2002 checkColorYellowCount = String.valueOf(checkData.get("checkColorYellowCount"));
2003 2003 break;
2004 2004 }
... ... @@ -2010,7 +2010,7 @@
2010 2010 String checkColorOrangeCount = "0";
2011 2011 if (CollectionUtils.isNotEmpty(checkColorOrangeCounts)) {
2012 2012 for (Map<String, String> checkData : checkColorOrangeCounts) {
2013   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2013 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2014 2014 checkColorOrangeCount = String.valueOf(checkData.get("checkColorOrangeCount"));
2015 2015 break;
2016 2016 }
... ... @@ -2022,7 +2022,7 @@
2022 2022 String checkColorRedCount = "0";
2023 2023 if (CollectionUtils.isNotEmpty( checkColorRedCounts)) {
2024 2024 for (Map<String, String> checkData : checkColorRedCounts) {
2025   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2025 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2026 2026 checkColorRedCount = String.valueOf(checkData.get("checkColorRedCount"));
2027 2027 break;
2028 2028 }
... ... @@ -2033,7 +2033,7 @@
2033 2033 String checkColorVioletCount = "0";
2034 2034 if (CollectionUtils.isNotEmpty(checkColorVioletCounts)) {
2035 2035 for (Map<String, String> checkData : checkColorVioletCounts) {
2036   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2036 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2037 2037 checkColorVioletCount = String.valueOf(checkData.get("checkColorVioletCount"));
2038 2038 break;
2039 2039 }
... ... @@ -2044,7 +2044,7 @@
2044 2044 String checkColorGreenCount = "0";
2045 2045 if (CollectionUtils.isNotEmpty(checkColorGreenCounts)) {
2046 2046 for (Map<String, String> checkData : checkColorGreenCounts) {
2047   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2047 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2048 2048 checkColorGreenCount = String.valueOf(checkData.get("checkColorGreenCount"));
2049 2049 break;
2050 2050 }
... ... @@ -2055,7 +2055,7 @@
2055 2055 String checkOneRiskCount = "0";
2056 2056 if (CollectionUtils.isNotEmpty(checkOneRiskCounts)) {
2057 2057 for (Map<String, String> checkData : checkOneRiskCounts) {
2058   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2058 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2059 2059 checkOneRiskCount = String.valueOf(checkData.get("checkOneRiskCount"));
2060 2060 break;
2061 2061 }
... ... @@ -2066,7 +2066,7 @@
2066 2066 String checkTwoRiskCount = "0";
2067 2067 if (CollectionUtils.isNotEmpty(checkTwoRiskCounts)) {
2068 2068 for (Map<String, String> checkData : checkTwoRiskCounts) {
2069   - if (hospitalName.equals(checkData.get("hospitalId"))) {
  2069 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2070 2070 checkTwoRiskCount = String.valueOf(checkData.get("checkTwoRiskCount"));
2071 2071 break;
2072 2072 }
... ... @@ -2077,7 +2077,7 @@
2077 2077 String checkThreeRiskCount = "0";
2078 2078 if (CollectionUtils.isNotEmpty(checkThreeRiskCounts)) {
2079 2079 for (Map<String, String> checkData : checkThreeRiskCounts) {
2080   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2080 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2081 2081 checkThreeRiskCount = String.valueOf(checkData.get("checkThreeRiskCount"));
2082 2082 break;
2083 2083 }
... ... @@ -2089,7 +2089,7 @@
2089 2089 String checkFourRiskCount = "0";
2090 2090 if (CollectionUtils.isNotEmpty(checkFourRiskCounts)) {
2091 2091 for (Map<String, String> checkData : checkFourRiskCounts) {
2092   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2092 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2093 2093 checkFourRiskCount = String.valueOf(checkData.get("checkFourRiskCount"));
2094 2094 break;
2095 2095 }
... ... @@ -2142,7 +2142,7 @@
2142 2142  
2143 2143 for (Map<String, String> map : matDeliverOrgCheckPersonCounts) {
2144 2144 String hospitalName = map.get("hospitalName");
2145   - String hospitalId = map.get("hospitalId");
  2145 + String hospitalId = String.valueOf(map.get("hospitalId"));
2146 2146  
2147 2147 map.put("hospitalName", hospitalName);
2148 2148 map.put("hospitalId", hospitalId);
... ... @@ -2151,7 +2151,7 @@
2151 2151 String matDeliverRiskPersonCount = "0";
2152 2152 if (CollectionUtils.isNotEmpty(matDeliverRiskPersonCounts)) {
2153 2153 for (Map<String, String> checkData : matDeliverRiskPersonCounts) {
2154   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2154 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2155 2155 matDeliverRiskPersonCount = String.valueOf(checkData.get("matDeliverRiskPersonCount"));
2156 2156 break;
2157 2157 }
... ... @@ -2163,7 +2163,7 @@
2163 2163 String matDeliverColorYellowCount = "0";
2164 2164 if (CollectionUtils.isNotEmpty(matDeliverColorYellowCounts)) {
2165 2165 for (Map<String, String> checkData : matDeliverColorYellowCounts) {
2166   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2166 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2167 2167 matDeliverColorYellowCount = String.valueOf(checkData.get("matDeliverColorYellowCount"));
2168 2168 break;
2169 2169 }
... ... @@ -2175,7 +2175,7 @@
2175 2175 String matDeliverColorOrangeCount = "0";
2176 2176 if (CollectionUtils.isNotEmpty(matDeliverColorOrangeCounts)) {
2177 2177 for (Map<String, String> checkData : matDeliverColorOrangeCounts) {
2178   - if (hospitalId.equals(checkData.get("hospitalId"))) {
  2178 + if (hospitalId.equals(String.valueOf(checkData.get("hospitalId")))) {
2179 2179 matDeliverColorOrangeCount = String.valueOf(checkData.get("matDeliverColorOrangeCount"));
2180 2180 break;
2181 2181 }
... ... @@ -2187,7 +2187,7 @@
2187 2187 String matDeliverColorRedCount = "0";
2188 2188 if (CollectionUtils.isNotEmpty( matDeliverColorRedCounts)) {
2189 2189 for (Map<String, String> matDeliverData : matDeliverColorRedCounts) {
2190   - if (hospitalId.equals(matDeliverData.get("hospitalId"))) {
  2190 + if (hospitalId.equals(String.valueOf(matDeliverData.get("hospitalId")))) {
2191 2191 matDeliverColorRedCount = String.valueOf(matDeliverData.get("matDeliverColorRedCount"));
2192 2192 break;
2193 2193 }
... ... @@ -2198,7 +2198,7 @@
2198 2198 String matDeliverColorVioletCount = "0";
2199 2199 if (CollectionUtils.isNotEmpty(matDeliverColorVioletCounts)) {
2200 2200 for (Map<String, String> matDeliverData : matDeliverColorVioletCounts) {
2201   - if (hospitalId.equals(matDeliverData.get("hospitalId"))) {
  2201 + if (hospitalId.equals(String.valueOf(matDeliverData.get("hospitalId")))) {
2202 2202 matDeliverColorVioletCount = String.valueOf(matDeliverData.get("matDeliverColorVioletCount"));
2203 2203 break;
2204 2204 }
... ... @@ -2209,7 +2209,7 @@
2209 2209 String matDeliverColorGreenCount = "0";
2210 2210 if (CollectionUtils.isNotEmpty(matDeliverColorGreenCounts)) {
2211 2211 for (Map<String, String> matDeliverData : matDeliverColorGreenCounts) {
2212   - if (hospitalId.equals(matDeliverData.get("hospitalId"))) {
  2212 + if (hospitalId.equals(String.valueOf(matDeliverData.get("hospitalId")))) {
2213 2213 matDeliverColorGreenCount = String.valueOf(matDeliverData.get("matDeliverColorGreenCount"));
2214 2214 break;
2215 2215 }
... ... @@ -2220,7 +2220,7 @@
2220 2220 String matDeliverOneRiskCount = "0";
2221 2221 if (CollectionUtils.isNotEmpty(matDeliverOneRiskCounts)) {
2222 2222 for (Map<String, String> matDeliverData : matDeliverOneRiskCounts) {
2223   - if (hospitalId.equals(matDeliverData.get("hospitalId"))) {
  2223 + if (hospitalId.equals(String.valueOf(matDeliverData.get("hospitalId")))) {
2224 2224 matDeliverOneRiskCount = String.valueOf(matDeliverData.get("matDeliverOneRiskCount"));
2225 2225 break;
2226 2226 }
... ... @@ -2231,7 +2231,7 @@
2231 2231 String matDeliverTwoRiskCount = "0";
2232 2232 if (CollectionUtils.isNotEmpty(matDeliverTwoRiskCounts)) {
2233 2233 for (Map<String, String> matDeliverData : matDeliverTwoRiskCounts) {
2234   - if (hospitalName.equals(matDeliverData.get("hospitalId"))) {
  2234 + if (hospitalId.equals(String.valueOf(matDeliverData.get("hospitalId")))) {
2235 2235 matDeliverTwoRiskCount = String.valueOf(matDeliverData.get("matDeliverTwoRiskCount"));
2236 2236 break;
2237 2237 }
... ... @@ -2242,7 +2242,7 @@
2242 2242 String matDeliverThreeRiskCount = "0";
2243 2243 if (CollectionUtils.isNotEmpty(matDeliverThreeRiskCounts)) {
2244 2244 for (Map<String, String> matDeliverData : matDeliverThreeRiskCounts) {
2245   - if (hospitalId.equals(matDeliverData.get("hospitalId"))) {
  2245 + if (hospitalId.equals(String.valueOf(matDeliverData.get("hospitalId")))) {
2246 2246 matDeliverThreeRiskCount = String.valueOf(matDeliverData.get("matDeliverThreeRiskCount"));
2247 2247 break;
2248 2248 }
... ... @@ -2254,7 +2254,7 @@
2254 2254 String matDeliverFourRiskCount = "0";
2255 2255 if (CollectionUtils.isNotEmpty(matDeliverFourRiskCounts)) {
2256 2256 for (Map<String, String> matDeliverData : matDeliverFourRiskCounts) {
2257   - if (hospitalId.equals(matDeliverData.get("hospitalId"))) {
  2257 + if (hospitalId.equals(String.valueOf(matDeliverData.get("hospitalId")))) {
2258 2258 matDeliverFourRiskCount = String.valueOf(matDeliverData.get("matDeliverFourRiskCount"));
2259 2259 break;
2260 2260 }