From e86ba0721477230b079ccaaff12e36119587be87 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 6 Jan 2021 10:50:05 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/pojo/BabyModel.java | 11 ++++++++ .../com/lyms/platform/query/BabyModelQuery.java | 9 ++++++ .../web/controller/BabyBuildController.java | 4 ++- .../operate/web/controller/TestController.java | 33 ++++++++++++++++++++++ .../operate/web/facade/AccessPermissionFacade.java | 5 ---- .../operate/web/facade/BabyBookbuildingFacade.java | 7 +++-- .../operate/web/facade/BabyCheckFacade.java | 1 + .../platform/operate/web/facade/CourseFacade.java | 3 -- .../operate/web/request/BabyManageRequest.java | 9 ++++++ .../operate/web/result/BabyManageListResult.java | 9 ++++++ .../platform/operate/web/utils/BabyListTask.java | 10 ++++++- 11 files changed, 88 insertions(+), 13 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java index 4170bf0..07b207e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java @@ -574,6 +574,17 @@ public class BabyModel extends BaseModel { //高危儿童唯一编号 根据年来分配 private Long riskCode; + //最后儿保检查医生 + private String lastCheckDoctor; + + public String getLastCheckDoctor() { + return lastCheckDoctor; + } + + public void setLastCheckDoctor(String lastCheckDoctor) { + this.lastCheckDoctor = lastCheckDoctor; + } + public Long getRiskCode() { return riskCode; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java index c654ab0..39c99b3 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java @@ -365,12 +365,21 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery { //是否开通疾病发生推送 1或者空没有开通 2开通 private String openDisease; + private String lastCheckDoctor; //分娩孕周 private Integer dueWeekStart; //分娩孕周 private Integer dueWeekEnd; + public String getLastCheckDoctor() { + return lastCheckDoctor; + } + + public void setLastCheckDoctor(String lastCheckDoctor) { + this.lastCheckDoctor = lastCheckDoctor; + } + public Integer getDueWeekEnd() { return dueWeekEnd; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java index 87794ac..540ec4c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java @@ -264,7 +264,8 @@ public class BabyBuildController extends BaseController { @RequestParam(value = "openDisease", required = false) String openDisease, @RequestParam(value = "endCase", required = false) Integer endCase, @RequestParam(value = "dueWeekStart", required = false) Integer dueWeekStart, - @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd + @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd, + @RequestParam(value = "lastCheckDoctor", required = false) String lastCheckDoctor ) { if (CollectionUtils.isNotEmpty(highRiskInfos)) { @@ -323,6 +324,7 @@ public class BabyBuildController extends BaseController { request.setOpenDisease(openDisease); request.setDueWeekStart(dueWeekStart); request.setDueWeekEnd(dueWeekEnd); + request.setLastCheckDoctor(lastCheckDoctor); return babyBookbuildingFacade.queryBabyList(request, loginState.getId()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index e48bb5b..bd5f360 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -4207,6 +4207,39 @@ public class TestController extends BaseController { } + /** + * 同步儿童最后一次检查的医生到儿童表 + * @param hospitalId + * @return + */ + @RequestMapping(value = "/syncBabyLastCheckDoctor", method = RequestMethod.GET) + @ResponseBody + public String syncBabyLastCheckDoctor(String hospitalId) + { + BabyModelQuery babyQuery = new BabyModelQuery(); + babyQuery.setHospitalId(hospitalId); + babyBookbuildingService.queryBabyBuildByCond(babyQuery, "created", Sort.Direction.DESC); + List models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); + if (CollectionUtils.isNotEmpty(models)) + { + for (BabyModel babyModel : models) + { + BabyCheckModelQuery query = new BabyCheckModelQuery(); + query.setYn(YnEnums.YES.getId()); + query.setBuildId(babyModel.getId()); + List checkModels = babyCheckService.queryBabyCheckRecord(query); + if (CollectionUtils.isNotEmpty(checkModels)) + { + babyModel.setLastCheckDoctor(checkModels.get(0).getCheckDoctor()); + babyBookbuildingService.updateBabyBuild(babyModel, babyModel.getId()); + System.out.println("babyId="+babyModel.getId()); + } + } + } + return "syncBabyLastCheckDoctor"; + } + + @RequestMapping(value = "/syncPatientByHospitalId", method = RequestMethod.GET) @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java index b5ace5b..a727936 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.java @@ -8,12 +8,7 @@ import java.util.concurrent.Callable; import java.util.concurrent.Future; import com.lyms.platform.common.enums.OptActionEnums; -import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ExceptionUtils; -import com.lyms.platform.operate.web.result.BabyManageListResult; -import com.lyms.platform.operate.web.utils.BabyListTask; -import com.lyms.platform.permission.model.OrganizationQuery; -import com.lyms.platform.pojo.BabyModel; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 7c2a348..c6128e0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -139,8 +139,7 @@ public class BabyBookbuildingFacade { @Autowired private UsersService usersService; - @Autowired - private SyncDataService syncDataService; + @Autowired private AntExRecordService recordService; @@ -2565,6 +2564,7 @@ public class BabyBookbuildingFacade { babyQuery.setVcCardNo(request.getVcCardNo()); babyQuery.setQueryNo(request.getQueryNo()); babyQuery.setOpenDisease(request.getOpenDisease()); + babyQuery.setLastCheckDoctor(request.getLastCheckDoctor()); //结案查询 babyQuery.setEndCase(request.getEndCase()); @@ -2655,7 +2655,7 @@ public class BabyBookbuildingFacade { basicConfigService, organizationService, babyCheckFacade, - ms, request.getIsArea(), hospitalName); + ms, request.getIsArea(), hospitalName,usersService); Future f = commonThreadPool.submit(c); futures.add(f); } @@ -5398,6 +5398,7 @@ public class BabyBookbuildingFacade { Map map = new HashMap(); map.put("id",model.getId()); map.put("doctorName",usersService.getUsers(Integer.parseInt(model.getDoctorId())).getName()); + map.put("doctorId",model.getDoctorId()); map.put("nextCheckTime",DateUtil.getyyyy_MM_dd(model.getNextCheckTime())); map.put("recordTime",DateUtil.getyyyy_MM_dd(model.getRecordTime())); map.put("content",model.getContent()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 0d0db8a..a6170fa 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -649,6 +649,7 @@ public class BabyCheckFacade extends BaseServiceImpl { } bm.setLastDiagnose(diagnoseNames); } + bm.setLastCheckDoctor(request.getCheckDoctor()); bm.setDiseases(request.getDiseases()); babyBookbuildingService.updateBabyBuild(bm, request.getBuildId()); syncMaster(request.getBuildId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index 99f1e18..f3916c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -10,10 +10,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.CourseRequest; -import com.lyms.platform.operate.web.result.BabyManageListResult; import com.lyms.platform.operate.web.result.CourseResult; -import com.lyms.platform.operate.web.result.CourseTypeResult; -import com.lyms.platform.operate.web.utils.BabyListTask; import com.lyms.platform.operate.web.utils.MessageCenterService; import com.lyms.platform.operate.web.worker.CourseCountWorker; import com.lyms.platform.permission.model.*; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java index 3f54f8b..552dedb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java @@ -104,6 +104,15 @@ public class BabyManageRequest extends BaseQuery { private Integer dueWeekStart; //分娩孕周 private Integer dueWeekEnd; + private String lastCheckDoctor; + + public String getLastCheckDoctor() { + return lastCheckDoctor; + } + + public void setLastCheckDoctor(String lastCheckDoctor) { + this.lastCheckDoctor = lastCheckDoctor; + } public Integer getDueWeekEnd() { return dueWeekEnd; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java index 728bf3a..ddd51dd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyManageListResult.java @@ -81,6 +81,15 @@ public class BabyManageListResult { //是否开通疾病发生推送 1或者空没有开通 2开通 private String openDisease; private Integer dueWeek; + private String lastCheckDoctor; + + public String getLastCheckDoctor() { + return lastCheckDoctor; + } + + public void setLastCheckDoctor(String lastCheckDoctor) { + this.lastCheckDoctor = lastCheckDoctor; + } public Integer getDueWeek() { return dueWeek; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java index a9aa3c2..ec29ef5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyListTask.java @@ -10,6 +10,7 @@ import com.lyms.platform.operate.web.facade.BabyCheckFacade; import com.lyms.platform.operate.web.facade.BasicConfigFacade; import com.lyms.platform.operate.web.result.BabyManageListResult; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BasicConfig; import org.apache.commons.collections.CollectionUtils; @@ -29,6 +30,7 @@ public class BabyListTask implements Callable { private OrganizationService organizationService; private BabyCheckFacade babyCheckFacade; + private UsersService usersService; private List models; @@ -44,7 +46,8 @@ public class BabyListTask implements Callable { BabyCheckFacade babyCheckFacade, List models, String isArea, - String hospitalName) { + String hospitalName, + UsersService usersService) { this.basicConfigFacade = basicConfigFacade; this.basicConfigService = basicConfigService; this.organizationService = organizationService; @@ -52,6 +55,7 @@ public class BabyListTask implements Callable { this.models = models; this.isArea = isArea; this.hospitalName = hospitalName; + this.usersService = usersService; } @@ -95,6 +99,10 @@ public class BabyListTask implements Callable { result.setHighRiskInfo(highRiskInfos); result.setWeakSon(model.getWeakSon() == null ? "否" : model.getWeakSon() == 1 ? "是" : "否"); result.setDueWeek(model.getDueWeek()); + if (StringUtils.isNotEmpty(model.getLastCheckDoctor())) + { + result.setLastCheckDoctor(usersService.getUsers(Integer.parseInt(model.getBuildDoctor())).getName()); + } result.setSex(model.getSex() == null ? "" : StringUtils.emptyDeal(SexEnum.getTextById(model.getSex()))); result.setBabyName(StringUtils.emptyDeal(model.getName())); -- 1.8.3.1