jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c32cec396a7acca56f07fd286e06345105c11aca

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

产筛

Showing 2 changed files with 49 additions and 3 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java View file @ c32cec3
... ... @@ -101,9 +101,9 @@
101 101 @ResponseBody
102 102 @TokenRequired
103 103 @RequestMapping(value = "/getSieveApplyInfo",method = RequestMethod.GET)
104   - public BaseResponse getSieveApplyInfo(@RequestParam("parentId")String parentId,@RequestParam(required = false)String type,HttpServletRequest request) {
  104 + public BaseResponse getSieveApplyInfo(@RequestParam("parentId")String parentId,@RequestParam(required = true)Integer type,HttpServletRequest request) {
105 105 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
106   - return sieveFacade.getSieveApplyInfo(parentId, loginState.getId());
  106 + return sieveFacade.getSieveApplyInfo(parentId, loginState.getId(), type);
107 107 }
108 108  
109 109  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ c32cec3
... ... @@ -21,7 +21,9 @@
21 21 import com.lyms.platform.operate.web.service.ITrackDownService;
22 22 import com.lyms.platform.operate.web.worker.SieveWorker;
23 23 import com.lyms.platform.permission.model.Organization;
  24 +import com.lyms.platform.permission.model.Users;
24 25 import com.lyms.platform.permission.service.OrganizationService;
  26 +import com.lyms.platform.permission.service.UsersService;
25 27 import com.lyms.platform.pojo.*;
26 28 import com.lyms.platform.query.*;
27 29 import javafx.beans.binding.ObjectExpression;
... ... @@ -61,6 +63,9 @@
61 63 private PatientsService patientsService;
62 64  
63 65 @Autowired
  66 + private UsersService usersService;
  67 +
  68 + @Autowired
64 69 private OrganizationGroupsFacade groupsFacade;
65 70  
66 71 @Autowired
... ... @@ -595,7 +600,7 @@
595 600 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult);
596 601 }
597 602  
598   - public BaseResponse getSieveApplyInfo(String parentId, Integer userId) {
  603 + public BaseResponse getSieveApplyInfo(String parentId, Integer userId,Integer type) {
599 604  
600 605 Map<String,Object> map = new HashMap<>();
601 606 String hospitalId = autoMatchFacade.getHospitalId(userId);
... ... @@ -651,6 +656,8 @@
651 656 if (CollectionUtils.isNotEmpty(sieveApplyOrderModels))
652 657 {
653 658 Map<String,Object> result = new HashMap<>();
  659 +
  660 + Map<String,Object> viewInfo = new HashMap<>();
654 661 SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0);
655 662  
656 663 result.put("id",sieveApply.getId());
... ... @@ -678,6 +685,45 @@
678 685 result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
679 686  
680 687 map.put("sieveApplyInfo",result);
  688 +
  689 + if (type == 1)
  690 + {
  691 + if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getApplyDoctor())) {
  692 + Users users = usersService.getUsers(Integer.parseInt(sieveApply.getApplyDoctor()));
  693 + if (users != null && users.getYn() == YnEnums.YES.getId()) {
  694 + viewInfo.put("applyDoctorName",users.getName());
  695 + }
  696 + }
  697 +
  698 + if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getCollectionDoctorId())) {
  699 + Users users = usersService.getUsers(Integer.parseInt(sieveApply.getCollectionDoctorId()));
  700 + if (users != null && users.getYn() == YnEnums.YES.getId()) {
  701 + viewInfo.put("collectionDoctorName",users.getName());
  702 + }
  703 + }
  704 +
  705 + if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getSendDoctor())) {
  706 + Users users = usersService.getUsers(Integer.parseInt(sieveApply.getSendDoctor()));
  707 + if (users != null && users.getYn() == YnEnums.YES.getId()) {
  708 + viewInfo.put("sendDoctorName",users.getName());
  709 + }
  710 + }
  711 + if (null != sieveApply.getApplyHospitalId()) {
  712 + Organization org = organizationService.getOrganization(Integer.valueOf(sieveApply.getApplyHospitalId()));
  713 + if (null != org) {
  714 + viewInfo.put("applyHospitalName", org.getName());
  715 + }
  716 + }
  717 +
  718 + map.put("viewInfo",viewInfo);
  719 + }
  720 + else if (type == 3)
  721 + {
  722 + Map<String,Object> sieveInfo = new HashMap<>();
  723 +
  724 +
  725 + map.put("sieveInfo",sieveInfo);
  726 + }
681 727  
682 728 }
683 729 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);