jiangjiazhi / regional-platform

Commit cc7409385881899e7536955895e4425be756f625

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

住院提醒

Showing 5 changed files with 32 additions and 19 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.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/request/PatientMarkRequest.java

1	1	package com.lyms.platform.permission.model;
2	2
3	3	import java.util.Date;
	4	+import java.util.List;
	5	+import java.util.Map;
4	6
5	7	public class PatientService {
6	8
7	9
...	...	@@ -18,9 +20,9 @@
18	20	*/
19	21	private Integer serType;
20	22	/**
21		- * 服务类型(1-孕期精准医疗、2-体重管理、3-血糖管理、4-血压管理、5-专家咨询、6-标准服务)
	23	+ * 服务信息
22	24	*/
23		- private String serTypes;
	25	+ private List<Map<String,String>> serInfos;
24	26	/**
25	27	* 指定医生
26	28	*/
27	29
...	...	@@ -106,12 +108,12 @@
106	108	this.orderId = orderId;
107	109	}
108	110
109		- public String getSerTypes() {
110		- return serTypes;
	111	+ public List<Map<String, String>> getSerInfos() {
	112	+ return serInfos;
111	113	}
112	114
113		- public void setSerTypes(String serTypes) {
114		- this.serTypes = serTypes;
	115	+ public void setSerInfos(List<Map<String, String>> serInfos) {
	116	+ this.serInfos = serInfos;
115	117	}
116	118
117	119	public Date getBackDate() {

...	...	@@ -176,14 +176,8 @@
176	176	return baseResponse;
177	177	}
178	178	//serType服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
179		- if(ps.getSerTypes()==null){
180		- baseResponse.setErrormsg("请传入serTypes");
181		- baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
182		- return baseResponse;
183		- }
184		- //指定医生
185		- if(ps.getSerDoct()==null){
186		- baseResponse.setErrormsg("请传入serDoct");
	179	+ if(ps.getSerInfos()==null){
	180	+ baseResponse.setErrormsg("请传入serInfos");
187	181	baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
188	182	return baseResponse;
189	183	}

...	...	@@ -1048,6 +1048,7 @@
1048	1048	} else if (patientMarkRequest.getType() == 3) {//3-住院提醒
1049	1049	//回院提醒状态为已提醒
1050	1050	patientMarkHospQuery.setBackStatus(2);
	1051	+ patientMarkHospQuery.setIsReality(patientMarkRequest.getIsReality());
1051	1052	patientMarkHospQuery.setBackResult(1);
1052	1053	patientMarkHospQuery.setInHospitResult(patientMarkRequest.getResult());
1053	1054	if (patientMarkRequest.getFailure() != null) {

...	...	@@ -128,16 +128,17 @@
128	128	public BaseResponse addPatientService(PatientService ps, Integer id) throws Exception {
129	129	//根据用户id获取医院ID
130	130	String hospitalId = autoMatchFacade.getHospitalId(id);
131		- String[] serTypes = ps.getSerTypes().split(",");
	131	+ List<Map<String,String>> serInfos = ps.getSerInfos();
	132	+
132	133	List<PatientService> patientServiceList = new ArrayList<>();
133		- for (String psType : serTypes) {
	134	+ for (Map<String,String> serInfo : serInfos) {
134	135	//先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
135	136	PatientServiceQuery patientQuery = new PatientServiceQuery();
136	137	patientQuery.setHospitalId(hospitalId);
137	138	patientQuery.setParentid(ps.getParentid());
138		- patientQuery.setSerType(Integer.parseInt(psType));
139		- patientQuery.setSerDoct(ps.getSerDoct());
	139	+ patientQuery.setSerType(Integer.parseInt(serInfo.get("serType")));
140	140
	141	+
141	142	List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
142	143	if (CollectionUtils.isNotEmpty(patientServices)) {
143	144	continue;
...	...	@@ -153,7 +154,10 @@
153	154	//默认开通状态
154	155	ps.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
155	156	//服务类型
156		- ps.setSerType(Integer.parseInt(psType));
	157	+ ps.setSerType(Integer.parseInt(serInfo.get("serType")));
	158	+ if(serInfo.containsKey(serInfo.get("serDoct"))){
	159	+ ps.setSerDoct(serInfo.get("serDoct"));
	160	+ }
157	161	//默认已经领取
158	162	ps.setStatus(2);
159	163	//默认待同步

...	...	@@ -45,6 +45,18 @@
45	45	* 查询号
46	46	*/
47	47	private String queryNo;
	48	+ /**
	49	+ * 是否实际住院 1-是，2-否
	50	+ */
	51	+ private Integer isReality;
	52	+
	53	+ public Integer getIsReality() {
	54	+ return isReality;
	55	+ }
	56	+
	57	+ public void setIsReality(Integer isReality) {
	58	+ this.isReality = isReality;
	59	+ }
48	60
49	61	public String getQueryNo() {
50	62	return queryNo;