jiangjiazhi / regional-platform | GitLab

Commit d7ccf3852a02353e82eda52c0e46c73d64c837c0

Authored by liquanyu over 7 years ago

1 parent ecff39bfb5

Exists in master and in 6 other branches

产筛

Showing 3 changed files with 6 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java

...	...	@@ -92,6 +92,8 @@
92	92
93	93	/**
94	94	* 查看申请单
	95	+ *
	96	+ * type 1 查看 2 修改 3 结果看
95	97	* @param parentId
96	98	* @param request
97	99	* @return
...	...	@@ -99,7 +101,7 @@
99	101	@ResponseBody
100	102	@TokenRequired
101	103	@RequestMapping(value = "/getSieveApplyInfo",method = RequestMethod.GET)
102		- public BaseResponse getSieveApplyInfo(@RequestParam("parentId")String parentId,HttpServletRequest request) {
	104	+ public BaseResponse getSieveApplyInfo(@RequestParam("parentId")String parentId,@RequestParam("type")String type,HttpServletRequest request) {
103	105	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
104	106	return sieveFacade.getSieveApplyInfo(parentId, loginState.getId());
105	107	}

...	...	@@ -422,7 +422,7 @@
422	422	List<SieveModel> modelList = sieveService.queryList(sieveQuery);
423	423	if (CollectionUtils.isEmpty(modelList)) {
424	424	SieveModel sieveModel = patientsService.convertToModel(patients);
425		- sieveModel.setReviceStatus(sieveApplyOrderAddRequest.getReviceStatus());
	425	+ sieveModel.setReviceStatus(1);
426	426	sieveModel.setFrom("2");
427	427	sieveModel.setHospitalId(orderModel.getHospitalId());
428	428	SieveService.handOrder(sieveModel);
...	...	@@ -455,7 +455,7 @@
455	455	{
456	456	SieveModel sieveModel = sieveModels.get(0);
457	457
458		- sieveModel.setReviceStatus(sieveApplyOrderAddRequest.getReviceStatus());
	458	+ sieveModel.setReviceStatus(1);
459	459
460	460	sieveModel.setApplyTime(sieveApplyOrderModel.getApplyTime());
461	461	sieveModel.setStatus(2);

...	...	@@ -722,7 +722,7 @@
722	722	result.put("sendDoctor",sieveApply.getSendDoctor());
723	723	result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime()));
724	724
725		- result.put("sieveApplyInfo",result);
	725	+ map.put("sieveApplyInfo",result);
726	726
727	727	}
728	728	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map);