shiyang / regional-platform

Download as
Browse Code »

Commit cef2463ea6e2f1dabb6dd59a641ca7ceb1bcd2ba

Authored by jiangjiazhi
1 parent bbef53be58
Exists in master and in 1 other branch nobuildprocess

孕妇分娩后 变成产妇

Showing 2 changed files with 13 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java View file @ cef2463
... ... @@ -32,10 +32,7 @@
32 32 @Controller
33 33 public class PuerperaManageController extends BaseController {
34 34  
35   -
36 35 @Autowired
37   - private PuerperaManagerFacade puerperaManagerFacade;
38   - @Autowired
39 36 private BasicConfigFacade basicConfigFacade;
40 37 @Autowired
41 38 private PatientFacade patientFacade;
... ... @@ -91,8 +88,10 @@
91 88 */
92 89 @RequestMapping(value = "/hPuer", method = RequestMethod.GET)
93 90 @ResponseBody
94   - public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest) {
95   - return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1);
  91 + @TokenRequired
  92 + public BaseResponse queryHighRiskPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
  93 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  94 + return patientFacade.queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1,loginState.getId());
96 95 }
97 96 /**
98 97 *全部孕妇管理
... ... @@ -102,8 +101,10 @@
102 101 */
103 102 @RequestMapping(value = "/aPuer", method = RequestMethod.GET)
104 103 @ResponseBody
105   - public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest) {
106   - return patientFacade.queryHighRisk(patientsQueryRequest,null,1);
  104 + @TokenRequired
  105 + public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request) {
  106 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  107 + return patientFacade.queryHighRisk(patientsQueryRequest,null,1,loginState.getId());
107 108 }
108 109  
109 110 /**
... ... @@ -113,8 +114,9 @@
113 114 */
114 115 @RequestMapping(value = "/apatients", method = RequestMethod.GET)
115 116 @ResponseBody
116   - public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest){
117   - return patientFacade.queryHighRisk(patientsQueryRequest, null, 3);
  117 + public BaseResponse queryAllPatients(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){
  118 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  119 + return patientFacade.queryHighRisk(patientsQueryRequest, null, 3,loginState.getId());
118 120 }
119 121  
120 122 @RequestMapping(value = "/apatients/enums", method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ cef2463
... ... @@ -191,7 +191,7 @@
191 191 * @param type 控制类型 1孕妇 3产妇
192 192 * @return
193 193 */
194   - public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type) {
  194 + public BaseResponse queryHighRisk(RiskPatientsQueryRequest riskPatientsQueryRequest, Boolean isHighRisk, int type,Integer userId) {
195 195 PatientsQuery patientsQuery = new PatientsQuery();
196 196 patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
197 197 patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
... ... @@ -210,6 +210,7 @@
210 210 patientsQuery.setServiceStatus(riskPatientsQueryRequest.getServiceStatus());
211 211 patientsQuery.setYn(YnEnums.YES.getId());
212 212 patientsQuery.setBuildType(1);
  213 + patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(userId));
213 214 //查询符合条件的孕妇
214 215 List<Patients> patientses = patientsService.queryPatient(patientsQuery);
215 216 List data = new ArrayList<>();