jiangjiazhi / regional-platform

Commit 92aeb89620c8d1d916d67412df57085e102c3873

Authored by zhangchao 10 months ago

Exists in dev

#fix:优化产后康复字典查询逻辑

Showing 4 changed files with 20 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumReportFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java

...	...	@@ -92,7 +92,7 @@
92	92	@ResponseBody
93	93	@TokenRequired
94	94	public BaseResponse getPatientInfo(@RequestParam String rFactor,
95		- @RequestParam Integer deliveryModel,
	95	+ @RequestParam(required = false) Integer deliveryModel,
96	96	@RequestParam Integer num,HttpServletRequest request){
97	97	PostpartumReportQuery postpartumReportQuery=new PostpartumReportQuery();
98	98	postpartumReportQuery.setDeliveryModel(deliveryModel);
...	...	@@ -108,7 +108,7 @@
108	108	@RequestMapping(method = RequestMethod.GET, value = "/wx/getPatientInfo")
109	109	@ResponseBody
110	110	public BaseResponse getWxPatientInfo(@RequestParam String rFactor,
111		- @RequestParam Integer deliveryModel,
	111	+ @RequestParam(required = false) Integer deliveryModel,
112	112	@RequestParam Integer num,@RequestParam String hospitalId){
113	113	PostpartumReportQuery postpartumReportQuery=new PostpartumReportQuery();
114	114	postpartumReportQuery.setDeliveryModel(deliveryModel);
...	...	@@ -118,6 +118,18 @@
118	118	return postpartumReportFacade.getPatientInfo(postpartumReportQuery,null);
119	119	}
120	120
	121	+ @RequestMapping(method = RequestMethod.GET, value = "/wx/model/getListType")
	122	+ @ResponseBody
	123	+ @TokenRequired
	124	+ public BaseResponse getWxPostpartumReportModelListType(Integer deliveryModel, Integer num,String riskFactorId,
	125	+ String hospitalId ) {
	126	+ PostpartumReportQuery postpartumReportQuery=new PostpartumReportQuery();
	127	+ postpartumReportQuery.setHospitalId(hospitalId);
	128	+ postpartumReportQuery.setDeliveryModel(deliveryModel);
	129	+ postpartumReportQuery.setNum(num);
	130	+ postpartumReportQuery.setrFactorList(StringUtils.covertToList(riskFactorId, String.class));
	131	+ return postpartumReportFacade.queryModelByType(postpartumReportQuery,null);
	132	+ }
121	133
122	134	/**
123	135	* 模板字典列表

...	...	@@ -653,7 +653,7 @@
653	653	//planTime 和 timeType为必填否则推送中心会推送异常
654	654	mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
655	655	mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
656		- mr.setKeyword2("产科");
	656	+ mr.setKeyword2("产科（请您点击此处查看服务内容全文）");
657	657	mr.setRemark(patient.getUsername());
658	658	mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
659	659	mr.setWxTempId("tx-UmDE3YMqYgAeFccXB7HIlTuG_tiP9LMdX2bvBpus");

...	...	@@ -136,8 +136,10 @@
136	136	}
137	137
138	138	public BaseResponse queryModelByType(PostpartumReportQuery postpartumReportQuery, Integer userId) {
139		- String hospitalId = autoMatchFacade.getHospitalId(userId);
140		- postpartumReportQuery.setHospitalId(hospitalId);
	139	+ if (userId!=null){
	140	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	141	+ postpartumReportQuery.setHospitalId(hospitalId);
	142	+ }
141	143	postpartumReportQuery.setYn(1);
142	144	List<PostpartumReportModel> mapList= postpartumReportModelService.queryList(postpartumReportQuery);
143	145	BaseResponse objectResponse = new BaseResponse();

...	...	@@ -589,6 +589,7 @@
589	589	temp.put("vcCardNo", p.getVcCardNo());
590	590	temp.put("pcerteTypeId", p.getPcerteTypeId());
591	591	temp.put("cardNo", p.getCardNo());
	592	+ temp.put("type",patientWeight.getType());
592	593	temp.put("isPrint", null==patientWeight.getIsPrint()?"":patientWeight.getIsPrint()==1?"已打印":"未打印");
593	594	restMap.add(temp);
594	595	}