jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 46df34f5feae3c9e0c75b975ca43b173ed438a32

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

承德-分娩统计同步数据优化，需传入机构id。孕产-孕产妇管理，全部产妇排序问题

Showing 2 changed files with 13 additions and 14 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 46df34f
... ... @@ -49,10 +49,7 @@
49 49 import org.springframework.data.mongodb.core.query.Update;
50 50 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
51 51 import org.springframework.stereotype.Controller;
52   -import org.springframework.web.bind.annotation.RequestMapping;
53   -import org.springframework.web.bind.annotation.RequestMethod;
54   -import org.springframework.web.bind.annotation.RequestParam;
55   -import org.springframework.web.bind.annotation.ResponseBody;
  52 +import org.springframework.web.bind.annotation.*;
56 53  
57 54 import javax.servlet.http.HttpServletRequest;
58 55 import javax.servlet.http.HttpServletResponse;
59 56  
60 57  
61 58  
... ... @@ -4841,15 +4838,15 @@
4841 4838 return "success";
4842 4839 }
4843 4840 /**
4844   - * 产妇分娩接生医生同步到Patients孕妇档案中。deliverDoctor字段
  4841 + * 产妇分娩接生医生同步到Patients孕妇档案中。deliverDoctor字段（先执行/updateDeliverDoctor/{id}，在执行该方法）
4845 4842 * @return
4846 4843 */
4847   - @RequestMapping(value = "/syncDeliverDoctor", method = RequestMethod.GET)
  4844 + @RequestMapping(value = "/syncDeliverDoctor/{id}", method = RequestMethod.GET)
4848 4845 @ResponseBody
4849   - public String syncDeliverDoctor() {
  4846 + public String syncDeliverDoctor(@PathVariable("id") String id) {
4850 4847 Criteria criteria=new Criteria();
4851 4848 criteria.and("yn").is(YnEnums.YES.getId());//有效数据
4852   - criteria.and("hospitalId").is("2100001605");//只同步隆化
  4849 + criteria.and("hospitalId").is(id);//传入需要同步的机构id
4853 4850 List <MaternalDeliverModel> maternalDeliverModelList = mongoTemplate.find(new Query(criteria), MaternalDeliverModel.class);
4854 4851 if (CollectionUtils.isEmpty(maternalDeliverModelList)) {
4855 4852 // 没有查到，直接抛出
4856 4853  
4857 4854  
4858 4855  
... ... @@ -4867,15 +4864,15 @@
4867 4864 return "success";
4868 4865 }
4869 4866 /**
4870   - * 产妇分娩-接生医生deliverDoctor字段把中文姓名批量更新为医生id（重名医生没有办法。）
  4867 + * 产妇分娩-接生医生deliverDoctor字段把中文姓名批量更新为医生id（重名医生没有办法。）先执行该方法在执行/syncDeliverDoctor/{id}
4871 4868 * @return
4872 4869 */
4873   - @RequestMapping(value = "/updateDeliverDoctor", method = RequestMethod.GET)
  4870 + @RequestMapping(value = "/updateDeliverDoctor/{id}", method = RequestMethod.GET)
4874 4871 @ResponseBody
4875   - public String updateDeliverDoctor() {
  4872 + public String updateDeliverDoctor(@PathVariable("id") String id) {
4876 4873 Criteria criteria=new Criteria();
4877 4874 criteria.and("yn").is(YnEnums.YES.getId());//有效数据
4878   - criteria.and("hospitalId").is("2100001605");//只同步隆化
  4875 + criteria.and("hospitalId").is(id);//传入需要同步的机构id
4879 4876 criteria.and("deliverDoctor").in(Pattern.compile("[^x00-xff]"));//模糊查询中文正则
4880 4877 List <MaternalDeliverModel> maternalDeliverModelList = mongoTemplate.find(new Query(criteria), MaternalDeliverModel.class);
4881 4878 if (CollectionUtils.isEmpty(maternalDeliverModelList)) {
4882 4879  
... ... @@ -4890,9 +4887,9 @@
4890 4887 //查询中文名对应的id
4891 4888 List<Users> queryUsersQueryList = usersService.queryUsers(usersQuery);
4892 4889 if(CollectionUtils.isNotEmpty(queryUsersQueryList)){
4893   - String id=queryUsersQueryList.get(0).getId().toString();
  4890 + String doctorId=queryUsersQueryList.get(0).getId().toString();
4894 4891 //替换中文姓名为id
4895   - deliverModel.setDeliverDoctor(id);
  4892 + deliverModel.setDeliverDoctor(doctorId);
4896 4893 matDeliverService.updateOne(deliverModel, deliverModel.getId());
4897 4894 }
4898 4895 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 46df34f
... ... @@ -688,6 +688,8 @@
688 688 * @return
689 689 */
690 690 public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, Integer type, Integer userId, String needPage, boolean isRegion) {
  691 + riskPatientsQueryRequest.setSort("fmDate");//统一按分娩时间排序
  692 + riskPatientsQueryRequest.setOrder("DESC");//降序
691 693 //组合请求
692 694 PatientsQuery patientsQuery = complayRequest(riskPatientsQueryRequest, isHighRisk, type, userId, needPage, isRegion);
693 695 patientsQuery.setGcdfDoctorId(riskPatientsQueryRequest.getGcdfDoctorId());//分娩记录加住院管床大夫