jiangjiazhi / regional-platform

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 21 additions and 12 deletions

...	...	@@ -75,7 +75,7 @@
75	75	@RequestMapping(method = RequestMethod.POST,value = "/postreviewDueDate")
76	76	@ResponseBody
77	77	@TokenRequired
78		- public BaseResponse addPostReviewDueDate(@Valid @RequestBody PostReviewRequest postReviewRequest,HttpServletRequest request){
	78	+ public BaseResponse addPostReviewDueDate(@Valid @RequestBody PostReviewQueryRequest postReviewRequest,HttpServletRequest request){
79	79	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
80	80	BaseResponse baseResponse = postReviewFacade.addPostReviewDueDate(postReviewRequest, loginState.getId());
81	81	return baseResponse;

...	...	@@ -515,8 +515,16 @@
515	515	}
516	516	}
517	517
518		- public BaseResponse addPostReviewDueDate(PostReviewRequest postReviewRequest, Integer id) {
519		- patientsService.setAutoMatDeliver(postReviewRequest.getCardNo(),DateUtil.parseYMD(postReviewRequest.getDueDate()));
	518	+ public BaseResponse addPostReviewDueDate(PostReviewQueryRequest postReviewRequest, Integer userId) {
	519	+
	520	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	521	+ Organization og = organizationService.getOrganization(Integer.valueOf(hospitalId));
	522	+ Patients patients = examinationFacade.findOnePatient(postReviewRequest.getCardNo(), postReviewRequest.getVcCardNo(), null, null, 1, false, null, og.getbStatus() != 1);
	523	+ if (patients != null)
	524	+ {
	525	+ patientsService.setAutoMatDeliver(patients.getCardNo(),DateUtil.parseYMD(postReviewRequest.getDueDate()));
	526	+ }
	527	+
520	528	return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
521	529	}
522	530	}

...	...	@@ -24,9 +24,19 @@
24	24
25	25	private String patientId;
26	26
	27	+ private String dueDate;
27	28
	29	+
28	30	//空的时候表示不只直接填写产后复查，不为空直接填写产后复查
29	31	private Integer flag;
	32	+
	33	+ public String getDueDate() {
	34	+ return dueDate;
	35	+ }
	36	+
	37	+ public void setDueDate(String dueDate) {
	38	+ this.dueDate = dueDate;
	39	+ }
30	40
31	41	public Integer getFlag() {
32	42	return flag;

...	...	@@ -124,15 +124,6 @@
124	124	// B超
125	125	private String bChao;
126	126
127		- private String cardNo;
128		-
129		- public String getCardNo() {
130		- return cardNo;
131		- }
132		-
133		- public void setCardNo(String cardNo) {
134		- this.cardNo = cardNo;
135		- }
136	127
137	128	public String getXhdb() {
138	129	return xhdb;