diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index f57e84f..283a839 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -101,9 +101,9 @@ public class SieveController extends BaseController { @ResponseBody @TokenRequired @RequestMapping(value = "/getSieveApplyInfo",method = RequestMethod.GET) - public BaseResponse getSieveApplyInfo(@RequestParam("parentId")String parentId,@RequestParam(required = false)String type,HttpServletRequest request) { + public BaseResponse getSieveApplyInfo(@RequestParam("parentId")String parentId,@RequestParam(required = true)Integer type,HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return sieveFacade.getSieveApplyInfo(parentId, loginState.getId()); + return sieveFacade.getSieveApplyInfo(parentId, loginState.getId(), type); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 5bdacb7..7483e71 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -21,7 +21,9 @@ import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.worker.SieveWorker; import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import javafx.beans.binding.ObjectExpression; @@ -61,6 +63,9 @@ public class SieveFacade { private PatientsService patientsService; @Autowired + private UsersService usersService; + + @Autowired private OrganizationGroupsFacade groupsFacade; @Autowired @@ -595,7 +600,7 @@ public class SieveFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult); } - public BaseResponse getSieveApplyInfo(String parentId, Integer userId) { + public BaseResponse getSieveApplyInfo(String parentId, Integer userId,Integer type) { Map map = new HashMap<>(); String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -651,6 +656,8 @@ public class SieveFacade { if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { Map result = new HashMap<>(); + + Map viewInfo = new HashMap<>(); SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); result.put("id",sieveApply.getId()); @@ -679,6 +686,45 @@ public class SieveFacade { map.put("sieveApplyInfo",result); + if (type == 1) + { + if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getApplyDoctor())) { + Users users = usersService.getUsers(Integer.parseInt(sieveApply.getApplyDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + viewInfo.put("applyDoctorName",users.getName()); + } + } + + if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getCollectionDoctorId())) { + Users users = usersService.getUsers(Integer.parseInt(sieveApply.getCollectionDoctorId())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + viewInfo.put("collectionDoctorName",users.getName()); + } + } + + if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getSendDoctor())) { + Users users = usersService.getUsers(Integer.parseInt(sieveApply.getSendDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + viewInfo.put("sendDoctorName",users.getName()); + } + } + if (null != sieveApply.getApplyHospitalId()) { + Organization org = organizationService.getOrganization(Integer.valueOf(sieveApply.getApplyHospitalId())); + if (null != org) { + viewInfo.put("applyHospitalName", org.getName()); + } + } + + map.put("viewInfo",viewInfo); + } + else if (type == 3) + { + Map sieveInfo = new HashMap<>(); + + + map.put("sieveInfo",sieveInfo); + } + } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map); }