From 46df34f5feae3c9e0c75b975ca43b173ed438a32 Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Wed, 1 Dec 2021 10:17:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=BF=E5=BE=B7-=E5=88=86=E5=A8=A9=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E9=9C=80=E4=BC=A0=E5=85=A5=E6=9C=BA=E6=9E=84id?= =?UTF-8?q?=E3=80=82=E5=AD=95=E4=BA=A7-=E5=AD=95=E4=BA=A7=E5=A6=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E5=85=A8=E9=83=A8=E4=BA=A7=E5=A6=87?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/TestController.java | 25 ++++++++++------------ .../platform/operate/web/facade/PatientFacade.java | 2 ++ 2 files changed, 13 insertions(+), 14 deletions(-) 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 832ea54..429fcf9 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 @@ -49,10 +49,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -4841,15 +4838,15 @@ public class TestController extends BaseController { return "success"; } /** - * 产妇分娩接生医生同步到Patients孕妇档案中。deliverDoctor字段 + * 产妇分娩接生医生同步到Patients孕妇档案中。deliverDoctor字段（先执行/updateDeliverDoctor/{id}，在执行该方法） * @return */ - @RequestMapping(value = "/syncDeliverDoctor", method = RequestMethod.GET) + @RequestMapping(value = "/syncDeliverDoctor/{id}", method = RequestMethod.GET) @ResponseBody - public String syncDeliverDoctor() { + public String syncDeliverDoctor(@PathVariable("id") String id) { Criteria criteria=new Criteria(); criteria.and("yn").is(YnEnums.YES.getId());//有效数据 - criteria.and("hospitalId").is("2100001605");//只同步隆化 + criteria.and("hospitalId").is(id);//传入需要同步的机构id List maternalDeliverModelList = mongoTemplate.find(new Query(criteria), MaternalDeliverModel.class); if (CollectionUtils.isEmpty(maternalDeliverModelList)) { // 没有查到，直接抛出 @@ -4867,15 +4864,15 @@ public class TestController extends BaseController { return "success"; } /** - * 产妇分娩-接生医生deliverDoctor字段把中文姓名批量更新为医生id（重名医生没有办法。） + * 产妇分娩-接生医生deliverDoctor字段把中文姓名批量更新为医生id（重名医生没有办法。）先执行该方法在执行/syncDeliverDoctor/{id} * @return */ - @RequestMapping(value = "/updateDeliverDoctor", method = RequestMethod.GET) + @RequestMapping(value = "/updateDeliverDoctor/{id}", method = RequestMethod.GET) @ResponseBody - public String updateDeliverDoctor() { + public String updateDeliverDoctor(@PathVariable("id") String id) { Criteria criteria=new Criteria(); criteria.and("yn").is(YnEnums.YES.getId());//有效数据 - criteria.and("hospitalId").is("2100001605");//只同步隆化 + criteria.and("hospitalId").is(id);//传入需要同步的机构id criteria.and("deliverDoctor").in(Pattern.compile("[^x00-xff]"));//模糊查询中文正则 List maternalDeliverModelList = mongoTemplate.find(new Query(criteria), MaternalDeliverModel.class); if (CollectionUtils.isEmpty(maternalDeliverModelList)) { @@ -4890,9 +4887,9 @@ public class TestController extends BaseController { //查询中文名对应的id List queryUsersQueryList = usersService.queryUsers(usersQuery); if(CollectionUtils.isNotEmpty(queryUsersQueryList)){ - String id=queryUsersQueryList.get(0).getId().toString(); + String doctorId=queryUsersQueryList.get(0).getId().toString(); //替换中文姓名为id - deliverModel.setDeliverDoctor(id); + deliverModel.setDeliverDoctor(doctorId); matDeliverService.updateOne(deliverModel, deliverModel.getId()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 90439c3..d7565ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -688,6 +688,8 @@ public class PatientFacade extends BaseServiceImpl { * @return */ public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) { + riskPatientsQueryRequest.setSort("fmDate");//统一按分娩时间排序 + riskPatientsQueryRequest.setOrder("DESC");//降序 //组合请求 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion); patientsQuery.setGcdfDoctorId(riskPatientsQueryRequest.getGcdfDoctorId());//分娩记录加住院管床大夫 -- 1.8.3.1