jiangjiazhi / regional-platform

Commit 10174e9aacbfc4fbb6b9d28a6d0a93049aeee07c

Authored by yangfei almost 8 years ago

Exists in master and in 6 other branches

服务价格配置同步

Showing 8 changed files with 191 additions and 96 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/HospitalDoctService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ConfigServiceController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ConfigServiceFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java

...	...	@@ -30,7 +30,7 @@
30	30	private BigDecimal doctPrice;
31	31
32	32	/**
33		- * 状态：0-有效、1-暂停、2-删除
	33	+ * 状态：1-有效、2-暂停、3-删除
34	34	*/
35	35	private Integer status;
36	36

...	...	@@ -7,8 +7,13 @@
7	7	import com.lyms.platform.common.constants.ErrorCodeConstants;
8	8	import com.lyms.platform.common.result.BaseListResponse;
9	9	import com.lyms.platform.common.result.BaseResponse;
	10	+import com.lyms.platform.common.utils.StringUtils;
10	11	import com.lyms.platform.operate.web.facade.ConfigServiceFacade;
11		-import com.lyms.platform.permission.model.PatientService;
	12	+import com.lyms.platform.operate.web.utils.CollectionUtils;
	13	+import com.lyms.platform.permission.model.HospitalServiceContent;
	14	+import com.lyms.platform.permission.model.Organization;
	15	+import com.lyms.platform.permission.model.OrganizationQuery;
	16	+import com.lyms.platform.permission.service.OrganizationService;
12	17	import org.springframework.beans.factory.annotation.Autowired;
13	18	import org.springframework.stereotype.Controller;
14	19	import org.springframework.web.bind.annotation.RequestMapping;
...	...	@@ -16,6 +21,7 @@
16	21	import org.springframework.web.bind.annotation.ResponseBody;
17	22
18	23	import javax.servlet.http.HttpServletRequest;
	24	+import java.util.List;
19	25
20	26	/**
21	27	* @auther yangfei
22	28
...	...	@@ -28,7 +34,10 @@
28	34
29	35	@Autowired
30	36	private ConfigServiceFacade configServiceFacade;
	37	+ @Autowired
	38	+ private OrganizationService organizationService;
31	39
	40	+
32	41	/**
33	42	* 初始化接口
34	43	*
35	44
36	45
37	46
38	47
39	48
...	...	@@ -48,24 +57,39 @@
48	57	* 新增或修改服务开通记录
49	58	*
50	59	* @param ps 服务开通记录
	60	+ * @param isAutoDoct 是否自动生成专家咨询的服务的数据
	61	+ * @param hospitalName 医院名称
51	62	* @param request
52	63	* @return
53	64	*/
54	65	@ResponseBody
55	66	@TokenRequired
56	67	@RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST)
57		- public BaseResponse addOrUpdatePatientService(PatientService ps, HttpServletRequest request) {
	68	+ public BaseResponse addOrUpdatePatientService(HospitalServiceContent ps,String hospitalName,boolean isAutoDoct, HttpServletRequest request) {
58	69	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	70	+
	71	+ if(StringUtils.isNotEmpty(hospitalName)){
	72	+ OrganizationQuery organizationQuery = new OrganizationQuery();
	73	+ organizationQuery.setName(hospitalName);
	74	+ List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
	75	+ if(CollectionUtils.isNotEmpty(organizations)){
	76	+ Organization organization = organizations.get(0);
	77	+ ps.setHospitalId(String.valueOf(organization.getId()));
	78	+ }
	79	+ }
	80	+
	81	+
59	82	try {
60	83	BaseResponse baseResponse = validatePatient(ps);
61	84	if (baseResponse.getErrorcode() != ErrorCodeConstants.SUCCESS) {
62	85	return baseResponse;
63	86	}
64		- return configServiceFacade.addHospitalService(ps, loginState.getId());
	87	+ return configServiceFacade.addHospitalService(ps,isAutoDoct, loginState.getId());
65	88	} catch (Exception e) {
	89	+ e.printStackTrace();
66	90	BaseResponse baseResponse = new BaseResponse();
67	91	baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
68		- baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
	92	+ baseResponse.setErrormsg(e.getMessage());
69	93	return baseResponse;
70	94	}
71	95
72	96
...	...	@@ -108,9 +132,25 @@
108	132	* @param ps
109	133	* @return
110	134	*/
111		- public BaseResponse validatePatient(PatientService ps) {
	135	+ public BaseResponse validatePatient(HospitalServiceContent ps) {
112	136	BaseResponse baseResponse = new BaseResponse();
113		-
	137	+ //医院Id
	138	+ if(StringUtils.isEmpty(ps.getHospitalId())){
	139	+ baseResponse.setErrormsg("请传入hospitalId");
	140	+ baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	141	+ return baseResponse;
	142	+ }
	143	+ //服务价格
	144	+ if(ps.getSerType()==null){
	145	+ baseResponse.setErrormsg("请传入serType:1-孕期精准医疗、2-体重管理、3-血糖管理、4-血压管理、5-专家咨询、6-标准服务");
	146	+ baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	147	+ return baseResponse;
	148	+ }
	149	+ if(ps.getSerPrice()==null){
	150	+ baseResponse.setErrormsg("请传入serPrice服务价格");
	151	+ baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
	152	+ return baseResponse;
	153	+ }
114	154	baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
115	155	return baseResponse;
116	156	}

...	...	@@ -55,46 +55,27 @@
55	55	@TokenRequired
56	56	@RequestMapping(value = "/addMatdeliverInfo", method = RequestMethod.POST)
57	57	public BaseResponse addMatdeliverInfo(MatDeliverFollowAddRequest matDeliverFollowAddRequest, HttpServletRequest request) {
58		- System.out.println(matDeliverFollowAddRequest);
	58	+ System.out.println("保存或修改随访记录："+matDeliverFollowAddRequest);
59	59	Integer userId = getUserId(request);
60	60	return matdeliverFollowFacade.addOrUpdateMatDeliverFollow(matDeliverFollowAddRequest, userId);
61	61	}
62	62
63		- // /**
64		- // * 查询分娩记录、随访记录
65		- // * @param pid 产妇pid
66		- // * @param id 分娩记录id
67		- // * @param request
68		- // * @return
69		- // */
70		- // @ResponseBody
71		- // @TokenRequired
72		- // @RequestMapping(method = RequestMethod.GET)
73		- // public BaseResponse findpostpartumFollowMakeList(String pid, String id, HttpServletRequest request) {
74		- // LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
75		- //
76		- // return postpartumFollowMakeFacade.findPostpartumFollowMakeList(pid, id, loginState.getId());
77		- // }
	63	+ /**
	64	+ * 查询分娩记录、随访记录
	65	+ *
	66	+ * @param pid 产妇pid
	67	+ * @param id 分娩记录id
	68	+ * @param request
	69	+ * @return
	70	+ */
	71	+ @ResponseBody
	72	+ @TokenRequired
	73	+ @RequestMapping(method = RequestMethod.GET)
	74	+ public BaseResponse findpostpartumFollowMakeList(String pid, String id, HttpServletRequest request) {
	75	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
78	76
79		- // @ResponseBody
80		- // @TokenRequired
81		- // @RequestMapping(method = RequestMethod.POST)
82		- // public BaseResponse addOrUpdatePostpartumFollowMake(PostpartumFollowMake ps, HttpServletRequest request) {
83		- // LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
84		- // try {
85		- // if (StringUtils.isEmpty(ps.getId())) {
86		- // return postpartumFollowMakeFacade.addPostpartumFollowMake(ps, loginState.getId());
87		- // } else {
88		- // return postpartumFollowMakeFacade.updatePostpartumFollowMake(ps, loginState.getId());
89		- // }
90		- // } catch (Exception e) {
91		- // BaseResponse baseResponse = new BaseResponse();
92		- // baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
93		- // baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
94		- // return baseResponse;
95		- // }
96		- //
97		- // }
	77	+ return matdeliverFollowFacade.findPostpartumFollowMakeList(pid, id, loginState.getId());
	78	+ }
98	79
99	80	@ResponseBody
100	81	@TokenRequired
...	...	@@ -113,6 +94,5 @@
113	94	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
114	95	return matdeliverFollowFacade.getPostpartumFollowMake(MatdeliverFollowRequest, loginState.getId());
115	96	}
116		-
117	97	}

...	...	@@ -4,7 +4,6 @@
4	4	import com.lyms.platform.common.base.PageInfo;
5	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
6	6	import com.lyms.platform.common.enums.HospitalSerStatusEnums;
7		-import com.lyms.platform.common.enums.OptActionEnums;
8	7	import com.lyms.platform.common.enums.PatientSerEnums;
9	8	import com.lyms.platform.common.result.BaseListResponse;
10	9	import com.lyms.platform.common.result.BaseObjectResponse;
11	10
...	...	@@ -17,11 +16,11 @@
17	16	import com.lyms.platform.permission.model.*;
18	17	import com.lyms.platform.permission.service.*;
19	18	import com.lyms.platform.pojo.BasicConfig;
20		-import com.lyms.platform.pojo.Patients;
21	19	import org.apache.commons.collections.CollectionUtils;
22	20	import org.springframework.beans.factory.annotation.Autowired;
23	21	import org.springframework.stereotype.Component;
24	22
	23	+import java.math.BigDecimal;
25	24	import java.util.*;
26	25
27	26	/**
28	27
...	...	@@ -90,11 +89,11 @@
90	89	List<HospitalServiceContent> hospitalServiceContents = hospitalServiceContentService.queryHospitalServiceContent(hscQuery);
91	90	List<HospitalServiceContentResult> hscResult = new ArrayList<>();
92	91
93		- Map<String,HospitalServiceContentResult> hscMap = new HashMap<>();
94		- for(HospitalServiceContent hsc:hospitalServiceContents){
	92	+ Map<String, HospitalServiceContentResult> hscMap = new HashMap<>();
	93	+ for (HospitalServiceContent hsc : hospitalServiceContents) {
95	94	HospitalServiceContentResult convertResult = convertToResult(hsc);
96	95	hscResult.add(convertResult);
97		- hscMap.put(hsc.getId(),convertResult);
	96	+ hscMap.put(hsc.getId(), convertResult);
98	97	}
99	98	HospitalDoctServiceQuery hospitalDoctServiceQuery = new HospitalDoctServiceQuery();
100	99	//状态 1--有效
101	100
...	...	@@ -102,9 +101,9 @@
102	101	hospitalDoctServiceQuery.setHospId(hsId);
103	102	List<HospitalDoctService> hospitalDoctServiceList = hospitalDoctService.queryHospitalDoctService(hospitalDoctServiceQuery);
104	103	//给医院服务加入医生的服务价格信息
105		- for(HospitalDoctService hds:hospitalDoctServiceList){
	104	+ for (HospitalDoctService hds : hospitalDoctServiceList) {
106	105	HospitalServiceContentResult hsc = hscMap.get(hds.getHospServiceId());
107		- if(hsc!=null){
	106	+ if (hsc != null) {
108	107	hsc.getHospitalDoctServices().add(doctServiceConvertToResult(hds));
109	108	}
110	109	}
111	110
112	111
113	112
114	113
115	114
116	115
117	116
118	117
119	118
...	...	@@ -118,52 +117,57 @@
118	117
119	118
120	119	/**
121		- * 新增服务开通记录
	120	+ * 新增医院服务配置
122	121	*
123	122	* @param ps
124	123	* @param id
125	124	* @return
126	125	*/
127		- public BaseResponse addHospitalService(PatientService ps, Integer id) throws Exception {
	126	+ public BaseResponse addHospitalService(HospitalServiceContent ps,boolean isAutoDoct, Integer id) throws Exception {
128	127	//根据用户id获取医院ID
129		- String hospitalId = autoMatchFacade.getHospitalId(id);
130		- List<Map<String, String>> serInfos = ps.getSerInfos();
	128	+ HospitalServiceContentQuery patientQuery = new HospitalServiceContentQuery();
	129	+ patientQuery.setHospitalId(ps.getHospitalId());
	130	+ patientQuery.setSerType(ps.getSerType());
131	131
132		- List<PatientService> patientServiceList = new ArrayList<>();
133		- for (Map<String, String> serInfo : serInfos) {
134		- //先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
135		- PatientServiceQuery patientQuery = new PatientServiceQuery();
136		- patientQuery.setHospitalId(hospitalId);
137		- patientQuery.setParentid(ps.getParentid());
138		- patientQuery.setSerType(Integer.parseInt(serInfo.get("serType")));
139	132
140		-
141		- List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
142		- if (CollectionUtils.isNotEmpty(patientServices)) {
143		- continue;
144		- }
145		-
146		- Patients patients = patientsService.findOnePatientById(ps.getParentid());
147		- if (patients != null) {
148		- ps.setPid(patients.getPid());
149		- }
	133	+ List<HospitalServiceContent> patientServices = hospitalServiceContentService.queryGroupHospitalServiceContent(patientQuery);
	134	+ if (CollectionUtils.isNotEmpty(patientServices)) {//修改
	135	+ HospitalServiceContent hospitalServiceContent = patientServices.get(0);
	136	+ hospitalServiceContent.setSyncStatus(0);
	137	+ hospitalServiceContent.setSerPrice(ps.getSerPrice());
	138	+ hospitalServiceContentService.updateHospitalServiceContent(hospitalServiceContent);
	139	+ }else{
150	140	ps.setId(UUID.randomUUID().toString().replace("-", ""));
151		-
152		- ps.setHospitalId(hospitalId);
	141	+ ps.setSyncStatus(0);
153	142	//默认开通状态
154		- ps.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
	143	+ ps.setStatus(1);
155	144	//服务类型
156		- ps.setSerType(Integer.parseInt(serInfo.get("serType")));
157		- if (serInfo.containsKey(serInfo.get("serDoct"))) {
158		- ps.setSerDoct(serInfo.get("serDoct"));
159		- }
160		- patientServiceService.addPatientService(ps);
	145	+ ps.setCreateDate(new Date());
	146	+ ps.setCreateUser(String.valueOf(id));
	147	+ hospitalServiceContentService.addHospitalServiceContent(ps);
161	148
162		- operateLogFacade.addAddOptLog(id, Integer.valueOf(hospitalId), ps, OptActionEnums.ADD.getId(), "开通增值服务");
163		-
164		- patientServiceList.add(ps);
	149	+ //自动创建专家咨询服务医生配置
	150	+ if(ps.getSerType() == PatientSerEnums.SerTypeEnums.zjzx.getId() && isAutoDoct){
	151	+ //查询医院
	152	+ String hospitalId = ps.getHospitalId();
	153	+ UsersQuery usersQuery = new UsersQuery();
	154	+ usersQuery.setOrgId(Integer.parseInt(hospitalId));
	155	+ usersQuery.setYn(1);
	156	+ usersQuery.setEnable(1);
	157	+ List<Users> users = usersService.queryUsers(usersQuery);
	158	+ for(Users us:users){
	159	+ HospitalDoctService doctService = new HospitalDoctService();
	160	+ doctService.setId(UUID.randomUUID().toString().replace("-", ""));
	161	+ doctService.setSyncStatus(0);
	162	+ doctService.setStatus(1);
	163	+ doctService.setDoctId(String.valueOf(us.getId()));
	164	+ doctService.setDoctPrice(new BigDecimal(0));
	165	+ doctService.setHospId(ps.getHospitalId());
	166	+ doctService.setHospServiceId(ps.getId());
	167	+ hospitalDoctService.addHospitalDoctService(doctService);
	168	+ }
	169	+ }
165	170	}
166		-
167	171	BaseResponse baseResponse = new BaseResponse();
168	172	baseResponse.setObject(ps.getId());
169	173	baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
...	...	@@ -207,7 +211,7 @@
207	211	}
208	212	}
209	213
210		- if(hs.getStatus()!=null){
	214	+ if (hs.getStatus() != null) {
211	215	result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
212	216	}
213	217	return result;
214	218
215	219
216	220
217	221
218	222
...	...	@@ -261,23 +265,23 @@
261	265	}
262	266	}
263	267
264		- if(StringUtils.isNotEmpty(hs.getSerTypes())){
265		- String serTypes [] = hs.getSerTypes().split(",");
	268	+ if (StringUtils.isNotEmpty(hs.getSerTypes())) {
	269	+ String serTypes[] = hs.getSerTypes().split(",");
266	270	StringBuffer stb = new StringBuffer();
267		- for(String st:serTypes){
	271	+ for (String st : serTypes) {
268	272	String serType = PatientSerEnums.SerTypeEnums.getTitle(Integer.parseInt(st));
269		- stb.append(serType+"/");
	273	+ stb.append(serType + "/");
270	274	}
271		- result.setSerTypeName(stb.toString().substring(0,stb.length()-1));
	275	+ result.setSerTypeName(stb.toString().substring(0, stb.length() - 1));
272	276	}
273	277
274		- if(hs.getSerType()!=null){
	278	+ if (hs.getSerType() != null) {
275	279	result.setSerTypeName(PatientSerEnums.SerTypeEnums.getTitle(hs.getSerType()));
276	280	}
277	281	result.setSerPrice(hs.getSerPrice());
278	282	result.setSerType(hs.getSerType());
279	283	result.setCreateDate(DateUtil.getyyyy_MM_dd(hs.getCreateDate()));
280		- if(hs.getStatus()!=null){
	284	+ if (hs.getStatus() != null) {
281	285	result.setStatus(HospitalSerStatusEnums.getNameById(hs.getStatus()));
282	286	}
283	287	return result;
284	288
...	...	@@ -286,13 +290,13 @@
286	290	/**
287	291	* 根据条件查询医院服务记录
288	292	*
289		- * @param pageInfo 分页信息
	293	+ * @param pageInfo 分页信息
290	294	* @return
291	295	*/
292	296	public BaseListResponse getHospitalService(PageInfo pageInfo, Integer id) {
293	297	//根据用户id获取医院ID
294	298	String hospitalId = autoMatchFacade.getHospitalId(id);
295		- HospitalServiceContentQuery hdsQuery = new HospitalServiceContentQuery();
	299	+ HospitalServiceContentQuery hdsQuery = new HospitalServiceContentQuery();
296	300	hdsQuery.setHospitalId(hospitalId);
297	301	hdsQuery.setSort("create_date desc");
298	302	hdsQuery.setNeed("y");

...	...	@@ -1217,6 +1217,7 @@
1217	1217
1218	1218	for(MaternalDeliverModel deliverModel : maternalDeliverModelList){
1219	1219	MatdeliverFollowListResult matdeliverFollowListResult = patientsMap.get(deliverModel.getParentId());
	1220	+ matdeliverFollowListResult.setId(deliverModel.getId());
1220	1221	//机构信息
1221	1222	Organization organization = organizationService.getOrganization(Integer.valueOf(deliverModel.getFmHospital()));
1222	1223	// 市

...	...	@@ -54,6 +54,15 @@
54	54	map.put("visitResult", PostpartumFollowMakeEnums.getResultEnum());
55	55	//访视状态（1-待访视、2-已访视）
56	56	map.put("visitStatus", PostpartumFollowMakeEnums.getStatusEnum());
	57	+ //访视类型
	58	+ map.put("followType", PostpartumFollowMakeEnums.getTypeEnum());
	59	+ //异常
	60	+ map.put("errorType", PostpartumFollowMakeEnums.getErrorTypeEnum());
	61	+ //预约失败原因
	62	+ map.put("contactReasonEnum", PostpartumFollowMakeEnums.getContactReasonEnum());
	63	+ //访视确认
	64	+ map.put("visitAffirm", PostpartumFollowMakeEnums.getVisitAffirmEnum());
	65	+
57	66
58	67	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map);
59	68	}

...	...	@@ -564,5 +564,56 @@
564	564	public void setReferHospital(String referHospital) {
565	565	this.referHospital = referHospital;
566	566	}
	567	+
	568	+ @Override
	569	+ public String toString() {
	570	+ return "MatDeliverFollowAddRequest{" +
	571	+ "id='" + id + '\'' +
	572	+ ", hospitalId='" + hospitalId + '\'' +
	573	+ ", deliveryDate=" + deliveryDate +
	574	+ ", deliverId='" + deliverId + '\'' +
	575	+ ", parentid='" + parentid + '\'' +
	576	+ ", pid='" + pid + '\'' +
	577	+ ", contactResult=" + contactResult +
	578	+ ", makeType=" + makeType +
	579	+ ", makeRemark='" + makeRemark + '\'' +
	580	+ ", makeCreateUser='" + makeCreateUser + '\'' +
	581	+ ", makeCreateDate=" + makeCreateDate +
	582	+ ", contactReason=" + contactReason +
	583	+ ", makeVisitDate=" + makeVisitDate +
	584	+ ", visitResult=" + visitResult +
	585	+ ", visitReason=" + visitReason +
	586	+ ", visitAffirm=" + visitAffirm +
	587	+ ", visitDate=" + visitDate +
	588	+ ", visitDoctor='" + visitDoctor + '\'' +
	589	+ ", visitStatus=" + visitStatus +
	590	+ ", visitRemark='" + visitRemark + '\'' +
	591	+ ", visitCreateUser='" + visitCreateUser + '\'' +
	592	+ ", visitCreateDate=" + visitCreateDate +
	593	+ ", nextVisitDate=" + nextVisitDate +
	594	+ ", isClose=" + isClose +
	595	+ ", postFollowId='" + postFollowId + '\'' +
	596	+ ", fmDate=" + fmDate +
	597	+ ", leaveDate=" + leaveDate +
	598	+ ", temperature='" + temperature + '\'' +
	599	+ ", fitnessDesc='" + fitnessDesc + '\'' +
	600	+ ", mentalityDesc='" + mentalityDesc + '\'' +
	601	+ ", bpv=" + bpv +
	602	+ ", bpk=" + bpk +
	603	+ ", breast='" + breast + '\'' +
	604	+ ", lochia='" + lochia + '\'' +
	605	+ ", matrix='" + matrix + '\'' +
	606	+ ", wound='" + wound + '\'' +
	607	+ ", otherDesc='" + otherDesc + '\'' +
	608	+ ", healthType=" + healthType +
	609	+ ", guideSuggest='" + guideSuggest + '\'' +
	610	+ ", guideOtherDesc='" + guideOtherDesc + '\'' +
	611	+ ", isRefer=" + isRefer +
	612	+ ", referReason='" + referReason + '\'' +
	613	+ ", referHospital='" + referHospital + '\'' +
	614	+ ", updateDate=" + updateDate +
	615	+ ", updateUser='" + updateUser + '\'' +
	616	+ '}';
	617	+ }
567	618	}

...	...	@@ -7,7 +7,10 @@
7	7	*/
8	8	public class MatdeliverFollowListResult {
9	9
10		-
	10	+ /**
	11	+ * 分娩记录主键id
	12	+ */
	13	+ private String id;
11	14	private String patientId;
12	15
13	16	private String pid;
...	...	@@ -75,6 +78,13 @@
75	78	*/
76	79	private Integer isClose;
77	80
	81	+ public String getId() {
	82	+ return id;
	83	+ }
	84	+
	85	+ public void setId(String id) {
	86	+ this.id = id;
	87	+ }
78	88
79	89	public Integer getIsClose() {
80	90	return isClose;