shiyang / regional-platform

Download as
Browse Code »

Commit 92d9d5ba24186de37e0ef0b7268c3305edf58b6a

Authored by hujiaqi
2 parents a26db599d4 5b487b996a
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java View file @ 92d9d5b
... ... @@ -162,11 +162,11 @@
162 162 keyName = ite.next();
163 163 if (i > 0)
164 164 { // 类容数据
165   - keyORvalue = map.get(keyName).toString();
  165 + keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
166 166 }
167 167 else
168 168 { // 第一行列名
169   - keyORvalue = map.get(keyName).toString();
  169 + keyORvalue = map.get(keyName) == null?"": map.get(keyName).toString();
170 170 keyName = columName.get(keyName);
171 171 ws.addCell(new Label(j, 0, keyName, wcf));
172 172 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 92d9d5b
... ... @@ -1899,6 +1899,7 @@
1899 1899 data.put("birthday", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth())));
1900 1900 data.put("mommyName", StringUtils.emptyDeal(model.getMname()));
1901 1901 data.put("mommnyPhone", StringUtils.emptyDeal(model.getMphone()));
  1902 + data.put("serviceType", StringUtils.emptyDeal(model.getServiceType() == null ? "" : ServiceTypeEnums.getTitleById(model.getServiceType())));
1902 1903 data.put("serviceStatus", StringUtils.emptyDeal(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus())));
1903 1904 data.put("nextDate", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate())));
1904 1905 data.put("monthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date())));
... ... @@ -1926,6 +1927,7 @@
1926 1927 cnames.put("birthday", "儿童生日");
1927 1928 cnames.put("mommyName", "母亲姓名");
1928 1929 cnames.put("mommnyPhone", "联系方式");
  1930 + cnames.put("serviceType", "服务类型");
1929 1931 cnames.put("serviceStatus", "服务状态");
1930 1932 cnames.put("nextDate", "下次预约时间");
1931 1933 cnames.put("monthAge", "月龄");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 92d9d5b
... ... @@ -631,6 +631,8 @@
631 631 data.put("checkDoctor", rp.getCheckDoctor());
632 632 data.put("lName", rp.getlName());
633 633 data.put("phone", rp.getRealPhone());
  634 + data.put("serviceType", rp.getServiceType());
  635 + data.put("serviceStatus", rp.getServiceStatus());
634 636 datas.add(data);
635 637 }
636 638 cnames.put("name", "姓名");
... ... @@ -646,7 +648,8 @@
646 648 cnames.put("checkDoctor", "产检医生");
647 649 cnames.put("lName", "登记人");
648 650 cnames.put("phone", "联系方式");
649   -
  651 + cnames.put("serviceType", "服务类型");
  652 + cnames.put("serviceStatus", "服务状态");
650 653 } else if (patientsQueryRequest.getQueryType() == 1) {
651 654 listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null, Boolean.FALSE);
652 655 List list = listResponse.getData();
... ... @@ -656,7 +659,6 @@
656 659 data.put("name", rp.getName());
657 660 data.put("age", rp.getAge());
658 661 data.put("dueWeek", rp.getDueWeek());
659   -
660 662 data.put("rLevel", getLevel(rp.getrLevel()));
661 663 data.put("cTimes", rp.getcTimes());
662 664 data.put("cHTimes", rp.getcHTimes());
... ... @@ -666,6 +668,7 @@
666 668 data.put("lName", rp.getlName());
667 669 data.put("phone", rp.getRealPhone());
668 670 data.put("serviceType", rp.getServiceType());
  671 + data.put("serviceStatus", rp.getServiceStatus());
669 672 datas.add(data);
670 673 }
671 674 cnames.put("name", "姓名");
... ... @@ -680,6 +683,7 @@
680 683 cnames.put("lName", "登记人");
681 684 cnames.put("phone", "联系方式");
682 685 cnames.put("serviceType", "服务类型");
  686 + cnames.put("serviceStatus", "服务状态");
683 687 } else if (patientsQueryRequest.getQueryType() == 2) {
684 688 listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null, Boolean.FALSE);
685 689 List list = listResponse.getData();
... ... @@ -696,6 +700,8 @@
696 700 data.put("checkDoctor", rp.getCheckDoctor());
697 701 data.put("lName", rp.getlName());
698 702 data.put("phone", rp.getRealPhone());
  703 + data.put("serviceType", "服务类型");
  704 + data.put("serviceStatus", "服务类型");
699 705 datas.add(data);
700 706 }
701 707 cnames.put("name", "姓名");
... ... @@ -708,6 +714,8 @@
708 714 cnames.put("checkDoctor", "检查医生");
709 715 cnames.put("phone", "联系方式");
710 716 cnames.put("lName", "登记人");
  717 + cnames.put("serviceType", "服务类型");
  718 + cnames.put("serviceStatus", "服务状态");
711 719 }
712 720 }
713 721  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ 92d9d5b
... ... @@ -33,8 +33,8 @@
33 33 @Component
34 34 public class RiskReportFacade {
35 35  
  36 + private static ExecutorService pool = Executors.newFixedThreadPool(4);
36 37  
37   -
38 38 @Autowired
39 39 private PatientsService patientsService;
40 40  
... ... @@ -109,7 +109,7 @@
109 109 List<BasicConfig> riskLevelConfig = basicConfigService.queryBasicConfig(basicConfigQuery);
110 110 if (CollectionUtils.isNotEmpty(riskLevelConfig))
111 111 {
112   - ExecutorService pool = Executors.newFixedThreadPool(riskLevelConfig.size());
  112 +
113 113 for(BasicConfig levelConfig : riskLevelConfig)
114 114 {
115 115 if ("e637b361-99cf-41eb-84f2-f0dab596e928".equals(levelConfig.getId()))
... ... @@ -123,8 +123,7 @@
123 123 Future f = pool.submit(c);
124 124 futures.add(f);
125 125 }
126   - // 关闭线程池
127   - pool.shutdown();
  126 +
128 127 }
129 128  
130 129 if (CollectionUtils.isNotEmpty(futures))
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java View file @ 92d9d5b
1 1 package com.lyms.platform.operate.web.result;
2 2  
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
  4 +import com.lyms.platform.common.enums.ServiceStatusEnums;
  5 +import com.lyms.platform.common.enums.ServiceTypeEnums;
4 6 import com.lyms.platform.common.utils.DateUtil;
5 7 import com.lyms.platform.common.utils.StringUtils;
6 8 import com.lyms.platform.pojo.Patients;
... ... @@ -275,6 +277,12 @@
275 277 setDueWeek("终止妊娠");
276 278 }else if(null!=destModel.getBuildType() &&2==destModel.getBuildType()){
277 279 setDueWeek("-");
  280 + }
  281 + if(null!=destModel.getServiceType()){
  282 + setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
  283 + }
  284 + if(null!=destModel.getServiceStatus()){
  285 + setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
278 286 }
279 287 setPid(destModel.getPid());
280 288 return this;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java View file @ 92d9d5b
1 1 package com.lyms.platform.operate.web.result;
2 2  
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
  4 +import com.lyms.platform.common.enums.ServiceStatusEnums;
4 5 import com.lyms.platform.common.enums.ServiceTypeEnums;
5 6 import com.lyms.platform.common.utils.DateUtil;
6 7 import com.lyms.platform.common.utils.JsonUtil;
... ... @@ -292,6 +293,9 @@
292 293 setlName(destModel.getPublishName());
293 294 if(null!=destModel.getServiceType()){
294 295 setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
  296 + }
  297 + if(null!=destModel.getServiceStatus()){
  298 + setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
295 299 }
296 300 return this;
297 301 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java View file @ 92d9d5b
... ... @@ -3,6 +3,8 @@
3 3 import com.lyms.platform.common.base.IBasicResultConvert;
4 4 import com.lyms.platform.common.core.annotation.form.Form;
5 5 import com.lyms.platform.common.core.annotation.form.FormParam;
  6 +import com.lyms.platform.common.enums.ServiceStatusEnums;
  7 +import com.lyms.platform.common.enums.ServiceTypeEnums;
6 8 import com.lyms.platform.common.utils.DateUtil;
7 9 import com.lyms.platform.common.utils.JsonUtil;
8 10 import com.lyms.platform.common.utils.StringUtils;
... ... @@ -306,6 +308,13 @@
306 308 this.dueWeek=StringUtils.dueWeek(days);
307 309 }
308 310 setPid(destModel.getPid());
  311 +
  312 + if(null!=destModel.getServiceType()){
  313 + setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
  314 + }
  315 + if(null!=destModel.getServiceStatus()){
  316 + setServiceStatus(ServiceStatusEnums.getNameById(destModel.getServiceStatus()));
  317 + }
309 318 return this;
310 319 }
311 320 }