jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e86ba0721477230b079ccaaff12e36119587be87

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

update

Showing 11 changed files with 88 additions and 13 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ e86ba07
... ... @@ -574,6 +574,17 @@
574 574 //高危儿童唯一编号 根据年来分配
575 575 private Long riskCode;
576 576  
  577 + //最后儿保检查医生
  578 + private String lastCheckDoctor;
  579 +
  580 + public String getLastCheckDoctor() {
  581 + return lastCheckDoctor;
  582 + }
  583 +
  584 + public void setLastCheckDoctor(String lastCheckDoctor) {
  585 + this.lastCheckDoctor = lastCheckDoctor;
  586 + }
  587 +
577 588 public Long getRiskCode() {
578 589 return riskCode;
579 590 }
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ e86ba07
... ... @@ -365,11 +365,20 @@
365 365  
366 366 //是否开通疾病发生推送 1或者空没有开通 2开通
367 367 private String openDisease;
  368 + private String lastCheckDoctor;
368 369  
369 370 //分娩孕周
370 371 private Integer dueWeekStart;
371 372 //分娩孕周
372 373 private Integer dueWeekEnd;
  374 +
  375 + public String getLastCheckDoctor() {
  376 + return lastCheckDoctor;
  377 + }
  378 +
  379 + public void setLastCheckDoctor(String lastCheckDoctor) {
  380 + this.lastCheckDoctor = lastCheckDoctor;
  381 + }
373 382  
374 383 public Integer getDueWeekEnd() {
375 384 return dueWeekEnd;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ e86ba07
... ... @@ -264,7 +264,8 @@
264 264 @RequestParam(value = "openDisease", required = false) String openDisease,
265 265 @RequestParam(value = "endCase", required = false) Integer endCase,
266 266 @RequestParam(value = "dueWeekStart", required = false) Integer dueWeekStart,
267   - @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd
  267 + @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd,
  268 + @RequestParam(value = "lastCheckDoctor", required = false) String lastCheckDoctor
268 269 ) {
269 270  
270 271 if (CollectionUtils.isNotEmpty(highRiskInfos)) {
... ... @@ -323,6 +324,7 @@
323 324 request.setOpenDisease(openDisease);
324 325 request.setDueWeekStart(dueWeekStart);
325 326 request.setDueWeekEnd(dueWeekEnd);
  327 + request.setLastCheckDoctor(lastCheckDoctor);
326 328  
327 329 return babyBookbuildingFacade.queryBabyList(request, loginState.getId());
328 330 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ e86ba07
... ... @@ -4207,6 +4207,39 @@
4207 4207 }
4208 4208  
4209 4209  
  4210 + /**
  4211 + * 同步儿童最后一次检查的医生到儿童表
  4212 + * @param hospitalId
  4213 + * @return
  4214 + */
  4215 + @RequestMapping(value = "/syncBabyLastCheckDoctor", method = RequestMethod.GET)
  4216 + @ResponseBody
  4217 + public String syncBabyLastCheckDoctor(String hospitalId)
  4218 + {
  4219 + BabyModelQuery babyQuery = new BabyModelQuery();
  4220 + babyQuery.setHospitalId(hospitalId);
  4221 + babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC);
  4222 + List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
  4223 + if (CollectionUtils.isNotEmpty(models))
  4224 + {
  4225 + for (BabyModel babyModel : models)
  4226 + {
  4227 + BabyCheckModelQuery query = new BabyCheckModelQuery();
  4228 + query.setYn(YnEnums.YES.getId());
  4229 + query.setBuildId(babyModel.getId());
  4230 + List<BabyCheckModel> checkModels = babyCheckService.queryBabyCheckRecord(query);
  4231 + if (CollectionUtils.isNotEmpty(checkModels))
  4232 + {
  4233 + babyModel.setLastCheckDoctor(checkModels.get(0).getCheckDoctor());
  4234 + babyBookbuildingService.updateBabyBuild(babyModel, babyModel.getId());
  4235 + System.out.println("babyId="+babyModel.getId());
  4236 + }
  4237 + }
  4238 + }
  4239 + return "syncBabyLastCheckDoctor";
  4240 + }
  4241 +
  4242 +
4210 4243  
4211 4244 @RequestMapping(value = "/syncPatientByHospitalId", method = RequestMethod.GET)
4212 4245 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java View file @ e86ba07
... ... @@ -8,12 +8,7 @@
8 8 import java.util.concurrent.Future;
9 9  
10 10 import com.lyms.platform.common.enums.OptActionEnums;
11   -import com.lyms.platform.common.enums.YnEnums;
12 11 import com.lyms.platform.common.utils.ExceptionUtils;
13   -import com.lyms.platform.operate.web.result.BabyManageListResult;
14   -import com.lyms.platform.operate.web.utils.BabyListTask;
15   -import com.lyms.platform.permission.model.OrganizationQuery;
16   -import com.lyms.platform.pojo.BabyModel;
17 12 import org.apache.commons.collections.CollectionUtils;
18 13 import org.apache.commons.lang.StringUtils;
19 14 import org.apache.commons.lang.math.NumberUtils;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ e86ba07
... ... @@ -139,9 +139,8 @@
139 139 @Autowired
140 140 private UsersService usersService;
141 141  
142   - @Autowired
143   - private SyncDataService syncDataService;
144 142  
  143 +
145 144 @Autowired
146 145 private AntExRecordService recordService;
147 146 @Autowired
... ... @@ -2565,6 +2564,7 @@
2565 2564 babyQuery.setVcCardNo(request.getVcCardNo());
2566 2565 babyQuery.setQueryNo(request.getQueryNo());
2567 2566 babyQuery.setOpenDisease(request.getOpenDisease());
  2567 + babyQuery.setLastCheckDoctor(request.getLastCheckDoctor());
2568 2568  
2569 2569 //结案查询
2570 2570 babyQuery.setEndCase(request.getEndCase());
... ... @@ -2655,7 +2655,7 @@
2655 2655 basicConfigService,
2656 2656 organizationService,
2657 2657 babyCheckFacade,
2658   - ms, request.getIsArea(), hospitalName);
  2658 + ms, request.getIsArea(), hospitalName,usersService);
2659 2659 Future f = commonThreadPool.submit(c);
2660 2660 futures.add(f);
2661 2661 }
... ... @@ -5398,6 +5398,7 @@
5398 5398 Map map = new HashMap();
5399 5399 map.put("id",model.getId());
5400 5400 map.put("doctorName",usersService.getUsers(Integer.parseInt(model.getDoctorId())).getName());
  5401 + map.put("doctorId",model.getDoctorId());
5401 5402 map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(model.getNextCheckTime()));
5402 5403 map.put("recordTime",DateUtil.getyyyy_MM_dd(model.getRecordTime()));
5403 5404 map.put("content",model.getContent());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ e86ba07
... ... @@ -649,6 +649,7 @@
649 649 }
650 650 bm.setLastDiagnose(diagnoseNames);
651 651 }
  652 + bm.setLastCheckDoctor(request.getCheckDoctor());
652 653 bm.setDiseases(request.getDiseases());
653 654 babyBookbuildingService.updateBabyBuild(bm, request.getBuildId());
654 655 syncMaster(request.getBuildId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ e86ba07
... ... @@ -10,10 +10,7 @@
10 10 import com.lyms.platform.common.result.BaseResponse;
11 11 import com.lyms.platform.common.utils.*;
12 12 import com.lyms.platform.operate.web.request.CourseRequest;
13   -import com.lyms.platform.operate.web.result.BabyManageListResult;
14 13 import com.lyms.platform.operate.web.result.CourseResult;
15   -import com.lyms.platform.operate.web.result.CourseTypeResult;
16   -import com.lyms.platform.operate.web.utils.BabyListTask;
17 14 import com.lyms.platform.operate.web.utils.MessageCenterService;
18 15 import com.lyms.platform.operate.web.worker.CourseCountWorker;
19 16 import com.lyms.platform.permission.model.*;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java View file @ e86ba07
... ... @@ -104,6 +104,15 @@
104 104 private Integer dueWeekStart;
105 105 //分娩孕周
106 106 private Integer dueWeekEnd;
  107 + private String lastCheckDoctor;
  108 +
  109 + public String getLastCheckDoctor() {
  110 + return lastCheckDoctor;
  111 + }
  112 +
  113 + public void setLastCheckDoctor(String lastCheckDoctor) {
  114 + this.lastCheckDoctor = lastCheckDoctor;
  115 + }
107 116  
108 117 public Integer getDueWeekEnd() {
109 118 return dueWeekEnd;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java View file @ e86ba07
... ... @@ -81,6 +81,15 @@
81 81 //是否开通疾病发生推送 1或者空没有开通 2开通
82 82 private String openDisease;
83 83 private Integer dueWeek;
  84 + private String lastCheckDoctor;
  85 +
  86 + public String getLastCheckDoctor() {
  87 + return lastCheckDoctor;
  88 + }
  89 +
  90 + public void setLastCheckDoctor(String lastCheckDoctor) {
  91 + this.lastCheckDoctor = lastCheckDoctor;
  92 + }
84 93  
85 94 public Integer getDueWeek() {
86 95 return dueWeek;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java View file @ e86ba07
... ... @@ -10,6 +10,7 @@
10 10 import com.lyms.platform.operate.web.facade.BasicConfigFacade;
11 11 import com.lyms.platform.operate.web.result.BabyManageListResult;
12 12 import com.lyms.platform.permission.service.OrganizationService;
  13 +import com.lyms.platform.permission.service.UsersService;
13 14 import com.lyms.platform.pojo.BabyModel;
14 15 import com.lyms.platform.pojo.BasicConfig;
15 16 import org.apache.commons.collections.CollectionUtils;
... ... @@ -29,6 +30,7 @@
29 30 private OrganizationService organizationService;
30 31  
31 32 private BabyCheckFacade babyCheckFacade;
  33 + private UsersService usersService;
32 34  
33 35 private List<BabyModel> models;
34 36  
... ... @@ -44,7 +46,8 @@
44 46 BabyCheckFacade babyCheckFacade,
45 47 List<BabyModel> models,
46 48 String isArea,
47   - String hospitalName) {
  49 + String hospitalName,
  50 + UsersService usersService) {
48 51 this.basicConfigFacade = basicConfigFacade;
49 52 this.basicConfigService = basicConfigService;
50 53 this.organizationService = organizationService;
... ... @@ -52,6 +55,7 @@
52 55 this.models = models;
53 56 this.isArea = isArea;
54 57 this.hospitalName = hospitalName;
  58 + this.usersService = usersService;
55 59  
56 60 }
57 61  
... ... @@ -95,6 +99,10 @@
95 99 result.setHighRiskInfo(highRiskInfos);
96 100 result.setWeakSon(model.getWeakSon() == null ? "否" : model.getWeakSon() == 1 ? "是" : "否");
97 101 result.setDueWeek(model.getDueWeek());
  102 + if (StringUtils.isNotEmpty(model.getLastCheckDoctor()))
  103 + {
  104 + result.setLastCheckDoctor(usersService.getUsers(Integer.parseInt(model.getBuildDoctor())).getName());
  105 + }
98 106  
99 107 result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex())));
100 108 result.setBabyName(StringUtils.emptyDeal(model.getName()));