jiangjiazhi / regional-platform

Commit 6319f2c8d1890b89d48321ca1d87c950400a28e1

Authored by yangfei about 8 years ago

Exists in master and in 6 other branches

产后随访

Showing 5 changed files with 372 additions and 238 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.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/facade/ViewFacade.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/MatdeliverFollowResult.java

...	...	@@ -111,10 +111,6 @@
111	111	*/
112	112	private String postFollowId;
113	113	/**
114		- * 分娩日期
115		- */
116		- private Date fmDate;
117		- /**
118	114	* 出院日期
119	115	*/
120	116	private Date leaveDate;
121	117
122	118
...	...	@@ -131,14 +127,10 @@
131	127	*/
132	128	private String mentalityDesc;
133	129	/**
134		- * 血压低
	130	+ * 血压
135	131	*/
136		- private Integer bpv;
	132	+ private String bp;
137	133	/**
138		- * 血压高
139		- */
140		- private Integer bpk;
141		- /**
142	134	* 乳房
143	135	*/
144	136	private Integer breast;
...	...	@@ -458,16 +450,6 @@
458	450
459	451	}
460	452
461		- public Date getFmDate() {
462		- return fmDate;
463		- }
464		-
465		-
466		- public void setFmDate(Date fmDate) {
467		- this.fmDate = fmDate;
468		-
469		- }
470		-
471	453	public Date getLeaveDate() {
472	454	return leaveDate;
473	455	}
474	456
...	...	@@ -508,24 +490,12 @@
508	490
509	491	}
510	492
511		- public Integer getBpv() {
512		- return bpv;
	493	+ public String getBp() {
	494	+ return bp;
513	495	}
514	496
515		-
516		- public void setBpv(Integer bpv) {
517		- this.bpv = bpv;
518		-
519		- }
520		-
521		- public Integer getBpk() {
522		- return bpk;
523		- }
524		-
525		-
526		- public void setBpk(Integer bpk) {
527		- this.bpk = bpk;
528		-
	497	+ public void setBp(String bp) {
	498	+ this.bp = bp;
529	499	}
530	500
531	501	public Integer getBreast() {

...	...	@@ -2,7 +2,6 @@
2	2
3	3	import com.lyms.platform.biz.service.MatDeliverFollowService;
4	4	import com.lyms.platform.biz.service.MatDeliverService;
5		-import com.lyms.platform.biz.service.PatientsService;
6	5	import com.lyms.platform.common.constants.ErrorCodeConstants;
7	6	import com.lyms.platform.common.enums.PostpartumFollowMakeEnums;
8	7	import com.lyms.platform.common.result.BaseListResponse;
9	8
...	...	@@ -13,7 +12,9 @@
13	12	import com.lyms.platform.operate.web.request.MatdeliverFollowRequest;
14	13	import com.lyms.platform.operate.web.result.MatdeliverFollowResult;
15	14	import com.lyms.platform.operate.web.utils.CollectionUtils;
	15	+import com.lyms.platform.permission.model.Organization;
16	16	import com.lyms.platform.permission.model.Users;
	17	+import com.lyms.platform.permission.service.OrganizationService;
17	18	import com.lyms.platform.permission.service.UsersService;
18	19	import com.lyms.platform.pojo.MatdeliverFollowModel;
19	20	import com.lyms.platform.pojo.MaternalDeliverModel;
20	21
...	...	@@ -36,15 +37,13 @@
36	37	@Autowired
37	38	private MatDeliverFollowService matDeliverFollowService;
38	39	@Autowired
39		- private PatientsService patientsService;
40		- @Autowired
41		- private AutoMatchFacade autoMatchFacade;
42		- @Autowired
43	40	private MatDeliverFacade matDeliverFacade;
44	41	@Autowired
45	42	private MatDeliverService matDeliverService;
46	43	@Autowired
47	44	private UsersService usersService;
	45	+ @Autowired
	46	+ private OrganizationService organizationService;
48	47
49	48	public BaseResponse matdeliverFollowMakeInit(Integer id) {
50	49	Map map = new HashMap();
51	50
...	...	@@ -130,10 +129,11 @@
130	129	*/
131	130	public BaseResponse addOrUpdateMatDeliverFollow(MatDeliverFollowAddRequest matDeliverFollowAddRequest, Integer userId) {
132	131	BaseResponse baseResponse = new BaseResponse();
133		- matDeliverFollowAddRequest.setUpdateDate(new Date());
	132	+ matDeliverFollowAddRequest.setUpdateDateStr(new Date());
134	133	matDeliverFollowAddRequest.setUpdateUser(String.valueOf(userId));
135	134
136	135	if (StringUtils.isNotEmpty(matDeliverFollowAddRequest.getId())) {//修改
	136	+ //修改随访信息
137	137	matDeliverFollowService.updateOne(matDeliverFollowAddRequest.convertToDataModel(), matDeliverFollowAddRequest.getId());
138	138
139	139	//获取分娩记录
...	...	@@ -141,7 +141,6 @@
141	141
142	142	//如果修改的是最后一次随访记录，则进行同步修改分娩记录里的随访信息
143	143	if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) {
144		-
145	144	//在分娩记录上记录随访部分信息
146	145	maternalDeliverModel.setContactResult(matDeliverFollowAddRequest.getContactResult());
147	146	maternalDeliverModel.setContactReason(matDeliverFollowAddRequest.getContactReason());
148	147
149	148
150	149
...	...	@@ -149,17 +148,17 @@
149	148	maternalDeliverModel.setVisitStatus(matDeliverFollowAddRequest.getVisitStatus());
150	149	maternalDeliverModel.setMakeType(matDeliverFollowAddRequest.getMakeType());
151	150	maternalDeliverModel.setVisitResult(matDeliverFollowAddRequest.getVisitResult());
152		- maternalDeliverModel.setNextVisitDate(matDeliverFollowAddRequest.getNextVisitDate());
	151	+ maternalDeliverModel.setNextVisitDate(matDeliverFollowAddRequest.getNextVisitDateStr());
153	152	maternalDeliverModel.setIsClose(matDeliverFollowAddRequest.getIsClose());
154	153	//修改分娩记录
155	154	matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
156	155	baseResponse.setObject(matDeliverFollowAddRequest.getId());
157	156	}
158		- //获取随访详情
159		- MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId());
160		-
161	157	} else {//新增随访记录，并同步更新分娩记录里的随访信息
	158	+ //预约操作信息
162	159	matDeliverFollowAddRequest.setId(null);
	160	+ matDeliverFollowAddRequest.setMakeCreateUser(String.valueOf(userId));
	161	+ matDeliverFollowAddRequest.setMakeCreateDate(new Date());
163	162	//新增随访记录
164	163	MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.addMatDeliverFollow(matDeliverFollowAddRequest.convertToDataModel());
165	164
...	...	@@ -230,6 +229,17 @@
230	229	}
231	230	} catch (Exception e) {
232	231	e.printStackTrace();
	232	+ }
	233	+ }
	234	+
	235	+ if(StringUtils.isNotEmpty(matdeliverFollowResult.getReferHospital())){
	236	+ try{
	237	+ Organization og = organizationService.getOrganization(Integer.valueOf(matdeliverFollowResult.getReferHospital()));
	238	+ if (null != og) {
	239	+ matdeliverFollowResult.setReferHospitalStr(og.getName());
	240	+ }
	241	+ }catch (Exception e){
	242	+
233	243	}
234	244	}
235	245

...	...	@@ -101,6 +101,7 @@
101	101
102	102	@Autowired
103	103	private PatientServiceFacade patientServiceFacade;
	104	+
104	105	/**
105	106	* 建档查询
106	107	*
107	108
108	109
109	110
...	...	@@ -123,16 +124,16 @@
123	124	return br;
124	125	}
125	126
126		- Map<String, Object> map = getPatientViewData(data,id);
	127	+ Map<String, Object> map = getPatientViewData(data, id);
127	128	/** 末次月经和纠正末次月经反起来返回 */
128		- if(data.getFuckLastMens() != null) {
	129	+ if (data.getFuckLastMens() != null) {
129	130	map.put("fuckLastMens", DateUtil.getyyyy_MM_dd(data.getLastMenses()));
130	131	map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getFuckLastMens()));
131	132	}
132	133	map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasisDoctorId()));
133		- BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id,0);
	134	+ BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id, 0);
134	135	List<PatientSerResult> patientSerResults = (List<PatientSerResult>) baseResponse.getObject();
135		- map.put("patientSerResults",patientSerResults);
	136	+ map.put("patientSerResults", patientSerResults);
136	137	//显示服务信息
137	138	br.setData(map);
138	139	br.setErrorcode(ErrorCodeConstants.SUCCESS);
139	140
...	...	@@ -140,15 +141,14 @@
140	141	return br;
141	142	}
142	143
143		- public Map<String, Object> getPatientViewData( Patients data ,String id)
144		- {
	144	+ public Map<String, Object> getPatientViewData(Patients data, String id) {
145	145	Map<String, Object> map = new HashMap<>();
146	146	map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()));
147	147	map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasis()));
148	148	map.put("lastMenstrualPeriodBasisDate", data.getLastMenstrualPeriodBasisDate());
149	149
150	150	map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()));
151		- if(BasisEnums.E.getId().equals(data.getLastMenstrualPeriodBasis())) {
	151	+ if (BasisEnums.E.getId().equals(data.getLastMenstrualPeriodBasis())) {
152	152	map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()) + "：" + data.getLastMenstrualPeriodBasisOther());
153	153	}
154	154
...	...	@@ -1176,7 +1176,7 @@
1176	1176	// map.put("treatmentOpinion2", mongoUtil.findPlatList2(data.getTreatmentOpinion2()));
1177	1177	map.put("treatmentOpinion3", getTreatmentOpinion3(data.getTreatmentOpinion2()));
1178	1178	// map.put("treatmentOpinion2", mongoUtil.findPlatList(data.getTreatmentOpinion2()));
1179		- map.put("quickenRemark",data.getQuickenRemark());
	1179	+ map.put("quickenRemark", data.getQuickenRemark());
1180	1180
1181	1181	/* 基本信息 */
1182	1182	//孕妇基本信息
1183	1183
...	...	@@ -1792,13 +1792,13 @@
1792	1792	}
1793	1793
1794	1794	private String getTreatmentOpinion3(Map<String, List<String>> ids) {
1795		- if(MapUtils.isNotEmpty(ids)) {
	1795	+ if (MapUtils.isNotEmpty(ids)) {
1796	1796	StringBuilder sb = new StringBuilder();
1797	1797	Integer count = 0;
1798	1798	Iterator<Map.Entry<String, List<String>>> iterator = ids.entrySet().iterator();
1799	1799	while (iterator.hasNext()) {
1800	1800	List<String> list = iterator.next().getValue();
1801		- if(com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(list)) {
	1801	+ if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(list)) {
1802	1802	for (int i = 0; i < list.size(); i++) {
1803	1803	sb.append(++count).append(".").append(list.get(i).split("\\[fuck\\]")[0]).append(",");
1804	1804	}
1805	1805
...	...	@@ -2296,16 +2296,18 @@
2296	2296	// 产后血压收缩压，舒张压
2297	2297	String ssy = "";
2298	2298	String szy = "";
2299		- Map<String, String> chBpMap = JsonUtil.getMap(data.getChBp());
2300		- if (MapUtils.isNotEmpty(chBpMap)) {
2301		- ssy = chBpMap.get("ssy");
2302		- szy = chBpMap.get("szy");
2303		- if (StringUtils.isNotEmpty(ssy)) {
2304		- map.put("ssy", UnitUtils.unitSplice(ssy, UnitConstants.MMHG));
2305		- }
	2299	+ if (StringUtils.isNotEmpty(data.getChBp())) {
	2300	+ Map<String, String> chBpMap = JsonUtil.getMap(data.getChBp());
	2301	+ if (MapUtils.isNotEmpty(chBpMap)) {
	2302	+ ssy = chBpMap.get("ssy");
	2303	+ szy = chBpMap.get("szy");
	2304	+ if (StringUtils.isNotEmpty(ssy)) {
	2305	+ map.put("ssy", UnitUtils.unitSplice(ssy, UnitConstants.MMHG));
	2306	+ }
2306	2307
2307		- if (StringUtils.isNotEmpty(szy)) {
2308		- map.put("szy", UnitUtils.unitSplice(szy, UnitConstants.MMHG));
	2308	+ if (StringUtils.isNotEmpty(szy)) {
	2309	+ map.put("szy", UnitUtils.unitSplice(szy, UnitConstants.MMHG));
	2310	+ }
2309	2311	}
2310	2312	}
2311	2313	// map.put("ssy", UnitUtils.unitSplice(ssy,UnitConstants.MMHG));
...	...	@@ -2314,8 +2316,7 @@
2314	2316	String ssy2h = "";
2315	2317	String szy2h = "";
2316	2318	Map<String, String> ch2BpMap = null;
2317		- if (StringUtils.isNotEmpty(data.getCh2Bp()))
2318		- {
	2319	+ if (StringUtils.isNotEmpty(data.getCh2Bp())) {
2319	2320	ch2BpMap = JsonUtil.getMap(data.getCh2Bp());
2320	2321	if (MapUtils.isNotEmpty(ch2BpMap)) {
2321	2322	ssy2h = ch2BpMap.get("ssy");
2322	2323
2323	2324
2324	2325
2325	2326
2326	2327
...	...	@@ -2686,23 +2687,23 @@
2686	2687	}
2687	2688	map.put("bp", com.lyms.platform.common.utils.StringUtils.isEmpty(UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG), ""));
2688	2689	//乳房
2689		- map.put("breast",postReviewModel.getBreast()==null?"":"未见异常".equals(postReviewModel.getBreast())?"1":"2");
2690		- map.put("breastText",postReviewModel.getBreast()==null?"":"未见异常".equals(postReviewModel.getBreast())?"":postReviewModel.getBreast());
	2690	+ map.put("breast", postReviewModel.getBreast() == null ? "" : "未见异常".equals(postReviewModel.getBreast()) ? "1" : "2");
	2691	+ map.put("breastText", postReviewModel.getBreast() == null ? "" : "未见异常".equals(postReviewModel.getBreast()) ? "" : postReviewModel.getBreast());
2691	2692	//恶露
2692		- map.put("lochia", postReviewModel.getLochia()==null?"":"未见异常".equals(postReviewModel.getLochia())?"1":"2");
2693		- map.put("lochiaText", postReviewModel.getLochia()==null?"":"未见异常".equals(postReviewModel.getLochia())?"":postReviewModel.getLochia());
	2693	+ map.put("lochia", postReviewModel.getLochia() == null ? "" : "未见异常".equals(postReviewModel.getLochia()) ? "1" : "2");
	2694	+ map.put("lochiaText", postReviewModel.getLochia() == null ? "" : "未见异常".equals(postReviewModel.getLochia()) ? "" : postReviewModel.getLochia());
2694	2695	map.put("vulva", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getVulva(), ""));
2695		- map.put("vagina",com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getVagina(), ""));
	2696	+ map.put("vagina", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getVagina(), ""));
2696	2697	map.put("cervixUteri", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getCervixUteri(), ""));
2697	2698	//子宫
2698		- map.put("matrix", postReviewModel.getMatrix()==null?"":"未见异常".equals(postReviewModel.getMatrix())?"1":"2");
2699		- map.put("matrixText", postReviewModel.getMatrix()==null?"":"未见异常".equals(postReviewModel.getMatrix())?"":postReviewModel.getMatrix());
	2699	+ map.put("matrix", postReviewModel.getMatrix() == null ? "" : "未见异常".equals(postReviewModel.getMatrix()) ? "1" : "2");
	2700	+ map.put("matrixText", postReviewModel.getMatrix() == null ? "" : "未见异常".equals(postReviewModel.getMatrix()) ? "" : postReviewModel.getMatrix());
2700	2701	map.put("fujian", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getFujian(), ""));
2701	2702	//伤口
2702		- map.put("wound", postReviewModel.getWound()==null?"":"未见异常".equals(postReviewModel.getWound())?"1":"2");
2703		- map.put("woundText", postReviewModel.getWound()==null?"":"未见异常".equals(postReviewModel.getWound())?"":postReviewModel.getWound());
	2703	+ map.put("wound", postReviewModel.getWound() == null ? "" : "未见异常".equals(postReviewModel.getWound()) ? "1" : "2");
	2704	+ map.put("woundText", postReviewModel.getWound() == null ? "" : "未见异常".equals(postReviewModel.getWound()) ? "" : postReviewModel.getWound());
2704	2705	map.put("other", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getOther(), ""));
2705		- map.put("suifangtime",com.lyms.platform.common.utils.StringUtils.isEmpty(DateUtil.getyyyy_MM_dd1(postReviewModel.getCheckTime()), ""));
	2706	+ map.put("suifangtime", com.lyms.platform.common.utils.StringUtils.isEmpty(DateUtil.getyyyy_MM_dd1(postReviewModel.getCheckTime()), ""));
2706	2707	map.put("fmtime", com.lyms.platform.common.utils.StringUtils.isEmpty(DateUtil.getyyyy_MM_dd1(patients.getFmDate()), ""));
2707	2708	map.put("healthStatus", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getHealthStatus(), ""));
2708	2709	map.put("psychology", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getPsychology(), ""));
...	...	@@ -2712,7 +2713,7 @@
2712	2713	map.put("boneDensity", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getBoneDensity(), ""));
2713	2714	map.put("ultrasonicExamination", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getUltrasonicExamination(), ""));
2714	2715
2715		- map.put("operator",usersService.getUsers(NumberUtils.toInt(postReviewModel.getProdDoctor())).getName() );
	2716	+ map.put("operator", usersService.getUsers(NumberUtils.toInt(postReviewModel.getProdDoctor())).getName());
2716	2717	map.put("treatOpinion", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getTreatOpinion(), ""));
2717	2718	map.put("dirOpinion", com.lyms.platform.common.utils.StringUtils.isEmpty(postReviewModel.getDirOpinion(), ""));
2718	2719	}
...	...	@@ -3663,7 +3664,7 @@
3663	3664	return result;
3664	3665	}
3665	3666
3666		- public BaseObjectResponse findSievePatientData(String cardNo, String vcCardNo,Integer userId) {
	3667	+ public BaseObjectResponse findSievePatientData(String cardNo, String vcCardNo, Integer userId) {
3667	3668
3668	3669	List<Patients> patients = new ArrayList<>();
3669	3670	PatientsQuery patientsQuery = new PatientsQuery();
...	...	@@ -3687,9 +3688,7 @@
3687	3688	patientsQuery.setHospitalId(null);
3688	3689	if (CollectionUtils.isNotEmpty(localPatients)) {
3689	3690	patients = localPatients;
3690		- }
3691		- else
3692		- {
	3691	+ } else {
3693	3692	//区域模式
3694	3693	patientsQuery.setHospitalList(groupsFacade.findGroupHospital(userId, false));
3695	3694
...	...	@@ -3706,8 +3705,7 @@
3706	3705	}
3707	3706	}
3708	3707	}
3709		- if (CollectionUtils.isNotEmpty(patients) && patients.get(0) != null)
3710		- {
	3708	+ if (CollectionUtils.isNotEmpty(patients) && patients.get(0) != null) {
3711	3709	return findPatientData(patients.get(0).getId());
3712	3710	}
3713	3711	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("未查询到数据");
...	...	@@ -3718,7 +3716,7 @@
3718	3716	}
3719	3717
3720	3718	public BaseObjectResponse prient(String id) {
3721		- if(mongoTemplate.exists(Query.query(Criteria.where("value").is(id).and("type").is(SequenceConstant.PRIENT_TYPE)), PlantformConfigModel.class)) {
	3719	+ if (mongoTemplate.exists(Query.query(Criteria.where("value").is(id).and("type").is(SequenceConstant.PRIENT_TYPE)), PlantformConfigModel.class)) {
3722	3720	return RespBuilder.buildSuccess("已经打印过了");
3723	3721	}
3724	3722	PlantformConfigModel plantformConfigModel = new PlantformConfigModel();

1	1	package com.lyms.platform.operate.web.request;
2	2
3	3	import com.lyms.platform.common.base.IBasicRequestConvert;
	4	+import com.lyms.platform.common.utils.StringUtils;
4	5	import com.lyms.platform.pojo.MatdeliverFollowModel;
5	6	import org.springframework.beans.BeanUtils;
6	7
...	...	@@ -23,7 +24,7 @@
23	24	/**
24	25	* 分娩日期
25	26	*/
26		- private Date deliveryDate;
	27	+ private Date deliveryDateStr;
27	28	/**
28	29	* 分娩记录id
29	30	*/
...	...	@@ -63,7 +64,7 @@
63	64	/**
64	65	* 预约访视日期
65	66	*/
66		- private Date makeVisitDate;
	67	+ private Date makeVisitDateStr;
67	68	/**
68	69	* 访视结果（1-成功、2-失败）
69	70	*/
...	...	@@ -79,7 +80,7 @@
79	80	/**
80	81	* 访视日期
81	82	*/
82		- private Date visitDate;
	83	+ private Date visitDateStr;
83	84	/**
84	85	* 访视医生
85	86	*/
...	...	@@ -91,7 +92,7 @@
91	92	/**
92	93	* 访视备注
93	94	*/
94		- private String visitRemark;
	95	+ private String visitRemark;
95	96	/**
96	97	* 访视操作员
97	98	*/
98	99
...	...	@@ -99,11 +100,11 @@
99	100	/**
100	101	* 访视操作日期
101	102	*/
102		- private Date visitCreateDate;
	103	+ private Date visitCreateDateStr;
103	104	/**
104	105	* 下次访视日期
105	106	*/
106		- private Date nextVisitDate;
	107	+ private Date nextVisitDateStr;
107	108	/**
108	109	* 是否结案 1-未结案、2-已结案
109	110	*/
110	111
...	...	@@ -113,13 +114,9 @@
113	114	*/
114	115	private String postFollowId;
115	116	/**
116		- * 分娩日期
117		- */
118		- private Date fmDate;
119		- /**
120	117	* 出院日期
121	118	*/
122		- private Date leaveDate;
	119	+ private Date leaveDateStr;
123	120	/**
124	121	* 体温
125	122	*/
126	123
127	124
128	125
...	...	@@ -133,13 +130,14 @@
133	130	*/
134	131	private String mentalityDesc;
135	132	/**
136		- * 血压低
	133	+ * 血压
137	134	*/
138		- private Integer bpv;
	135	+ private String bp;
139	136	/**
140		- * 血压高
	137	+ * 血压MAP信息
141	138	*/
142		- private Integer bpk;
	139	+ private String bpMap;
	140	+
143	141	/**
144	142	* 乳房
145	143	*/
...	...	@@ -168,6 +166,10 @@
168	166	* 指导意见
169	167	*/
170	168	private String guideSuggest;
	169	+ /**
	170	+ * 指导意见Map
	171	+ */
	172	+ private String guideSuggestMap;
171	173
172	174	/**
173	175	* 是否转诊转诊（1-无、2-有）
174	176
...	...	@@ -185,11 +187,12 @@
185	187	/**
186	188	* 修改时间
187	189	*/
188		- private Date updateDate;
	190	+ private Date updateDateStr;
189	191	/**
190	192	* 修改人
191	193	*/
192	194	private String updateUser;
	195	+
193	196	/**
194	197	* 具体转换实现
195	198	*
196	199
...	...	@@ -198,11 +201,32 @@
198	201	@Override
199	202	public MatdeliverFollowModel convertToDataModel() {
200	203	MatdeliverFollowModel matdeliverFollowModel = new MatdeliverFollowModel();
201		-
202		- BeanUtils.copyProperties(this,matdeliverFollowModel);
	204	+ BeanUtils.copyProperties(this, matdeliverFollowModel);
	205	+ matdeliverFollowModel.setMakeCreateDate(makeCreateDate);
	206	+ matdeliverFollowModel.setMakeVisitDate(makeVisitDateStr);
	207	+ matdeliverFollowModel.setVisitDate(visitDateStr);
	208	+ matdeliverFollowModel.setVisitCreateDate(visitCreateDateStr);
	209	+ matdeliverFollowModel.setNextVisitDate(nextVisitDateStr);
	210	+ matdeliverFollowModel.setLeaveDate(leaveDateStr);
	211	+ matdeliverFollowModel.setUpdateDate(updateDateStr);
	212	+ matdeliverFollowModel.setDeliveryDate(deliveryDateStr);
	213	+ if (StringUtils.isNotEmpty(guideSuggestMap)) {
	214	+ matdeliverFollowModel.setGuideSuggest(guideSuggestMap);
	215	+ }
	216	+ if (StringUtils.isNotEmpty(bpMap)) {
	217	+ matdeliverFollowModel.setBp(bpMap);
	218	+ }
203	219	return matdeliverFollowModel;
204	220	}
205	221
	222	+ public String getGuideSuggestMap() {
	223	+ return guideSuggestMap;
	224	+ }
	225	+
	226	+ public void setGuideSuggestMap(String guideSuggestMap) {
	227	+ this.guideSuggestMap = guideSuggestMap;
	228	+ }
	229	+
206	230	public Integer getBreast() {
207	231	return breast;
208	232	}
209	233
...	...	@@ -227,14 +251,7 @@
227	251	this.wound = wound;
228	252	}
229	253
230		- public Date getUpdateDate() {
231		- return updateDate;
232		- }
233	254
234		- public void setUpdateDate(Date updateDate) {
235		- this.updateDate = updateDate;
236		- }
237		-
238	255	public String getUpdateUser() {
239	256	return updateUser;
240	257	}
241	258
...	...	@@ -259,14 +276,7 @@
259	276	this.hospitalId = hospitalId;
260	277	}
261	278
262		- public Date getDeliveryDate() {
263		- return deliveryDate;
264		- }
265	279
266		- public void setDeliveryDate(Date deliveryDate) {
267		- this.deliveryDate = deliveryDate;
268		- }
269		-
270	280	public String getDeliverId() {
271	281	return deliverId;
272	282	}
...	...	@@ -323,6 +333,14 @@
323	333	this.makeCreateUser = makeCreateUser;
324	334	}
325	335
	336	+ public Date getDeliveryDateStr() {
	337	+ return deliveryDateStr;
	338	+ }
	339	+
	340	+ public void setDeliveryDateStr(Date deliveryDateStr) {
	341	+ this.deliveryDateStr = deliveryDateStr;
	342	+ }
	343	+
326	344	public Date getMakeCreateDate() {
327	345	return makeCreateDate;
328	346	}
329	347
330	348
...	...	@@ -339,14 +357,22 @@
339	357	this.contactReason = contactReason;
340	358	}
341	359
342		- public Date getMakeVisitDate() {
343		- return makeVisitDate;
	360	+ public String getBpMap() {
	361	+ return bpMap;
344	362	}
345	363
346		- public void setMakeVisitDate(Date makeVisitDate) {
347		- this.makeVisitDate = makeVisitDate;
	364	+ public void setBpMap(String bpMap) {
	365	+ this.bpMap = bpMap;
348	366	}
349	367
	368	+ public Date getMakeVisitDateStr() {
	369	+ return makeVisitDateStr;
	370	+ }
	371	+
	372	+ public void setMakeVisitDateStr(Date makeVisitDateStr) {
	373	+ this.makeVisitDateStr = makeVisitDateStr;
	374	+ }
	375	+
350	376	public Integer getVisitResult() {
351	377	return visitResult;
352	378	}
353	379
...	...	@@ -371,12 +397,12 @@
371	397	this.visitAffirm = visitAffirm;
372	398	}
373	399
374		- public Date getVisitDate() {
375		- return visitDate;
	400	+ public Date getVisitDateStr() {
	401	+ return visitDateStr;
376	402	}
377	403
378		- public void setVisitDate(Date visitDate) {
379		- this.visitDate = visitDate;
	404	+ public void setVisitDateStr(Date visitDateStr) {
	405	+ this.visitDateStr = visitDateStr;
380	406	}
381	407
382	408	public String getVisitDoctor() {
383	409
384	410
385	411
...	...	@@ -411,20 +437,20 @@
411	437	this.visitCreateUser = visitCreateUser;
412	438	}
413	439
414		- public Date getVisitCreateDate() {
415		- return visitCreateDate;
	440	+ public Date getVisitCreateDateStr() {
	441	+ return visitCreateDateStr;
416	442	}
417	443
418		- public void setVisitCreateDate(Date visitCreateDate) {
419		- this.visitCreateDate = visitCreateDate;
	444	+ public void setVisitCreateDateStr(Date visitCreateDateStr) {
	445	+ this.visitCreateDateStr = visitCreateDateStr;
420	446	}
421	447
422		- public Date getNextVisitDate() {
423		- return nextVisitDate;
	448	+ public Date getNextVisitDateStr() {
	449	+ return nextVisitDateStr;
424	450	}
425	451
426		- public void setNextVisitDate(Date nextVisitDate) {
427		- this.nextVisitDate = nextVisitDate;
	452	+ public void setNextVisitDateStr(Date nextVisitDateStr) {
	453	+ this.nextVisitDateStr = nextVisitDateStr;
428	454	}
429	455
430	456	public Integer getIsClose() {
431	457
432	458
...	...	@@ -443,22 +469,14 @@
443	469	this.postFollowId = postFollowId;
444	470	}
445	471
446		- public Date getFmDate() {
447		- return fmDate;
	472	+ public Date getLeaveDateStr() {
	473	+ return leaveDateStr;
448	474	}
449	475
450		- public void setFmDate(Date fmDate) {
451		- this.fmDate = fmDate;
	476	+ public void setLeaveDateStr(Date leaveDateStr) {
	477	+ this.leaveDateStr = leaveDateStr;
452	478	}
453	479
454		- public Date getLeaveDate() {
455		- return leaveDate;
456		- }
457		-
458		- public void setLeaveDate(Date leaveDate) {
459		- this.leaveDate = leaveDate;
460		- }
461		-
462	480	public String getTemperature() {
463	481	return temperature;
464	482	}
465	483
466	484
...	...	@@ -483,22 +501,14 @@
483	501	this.mentalityDesc = mentalityDesc;
484	502	}
485	503
486		- public Integer getBpv() {
487		- return bpv;
	504	+ public String getBp() {
	505	+ return bp;
488	506	}
489	507
490		- public void setBpv(Integer bpv) {
491		- this.bpv = bpv;
	508	+ public void setBp(String bp) {
	509	+ this.bp = bp;
492	510	}
493	511
494		- public Integer getBpk() {
495		- return bpk;
496		- }
497		-
498		- public void setBpk(Integer bpk) {
499		- this.bpk = bpk;
500		- }
501		-
502	512	public String getMatrix() {
503	513	return matrix;
504	514	}
...	...	@@ -555,54 +565,12 @@
555	565	this.referHospital = referHospital;
556	566	}
557	567
558		- @Override
559		- public String toString() {
560		- return "MatDeliverFollowAddRequest{" +
561		- "id='" + id + '\'' +
562		- ", hospitalId='" + hospitalId + '\'' +
563		- ", deliveryDate=" + deliveryDate +
564		- ", deliverId='" + deliverId + '\'' +
565		- ", parentid='" + parentid + '\'' +
566		- ", pid='" + pid + '\'' +
567		- ", contactResult=" + contactResult +
568		- ", makeType=" + makeType +
569		- ", makeRemark='" + makeRemark + '\'' +
570		- ", makeCreateUser='" + makeCreateUser + '\'' +
571		- ", makeCreateDate=" + makeCreateDate +
572		- ", contactReason=" + contactReason +
573		- ", makeVisitDate=" + makeVisitDate +
574		- ", visitResult=" + visitResult +
575		- ", visitReason=" + visitReason +
576		- ", visitAffirm=" + visitAffirm +
577		- ", visitDate=" + visitDate +
578		- ", visitDoctor='" + visitDoctor + '\'' +
579		- ", visitStatus=" + visitStatus +
580		- ", visitRemark='" + visitRemark + '\'' +
581		- ", visitCreateUser='" + visitCreateUser + '\'' +
582		- ", visitCreateDate=" + visitCreateDate +
583		- ", nextVisitDate=" + nextVisitDate +
584		- ", isClose=" + isClose +
585		- ", postFollowId='" + postFollowId + '\'' +
586		- ", fmDate=" + fmDate +
587		- ", leaveDate=" + leaveDate +
588		- ", temperature='" + temperature + '\'' +
589		- ", fitnessDesc='" + fitnessDesc + '\'' +
590		- ", mentalityDesc='" + mentalityDesc + '\'' +
591		- ", bpv=" + bpv +
592		- ", bpk=" + bpk +
593		- ", breast='" + breast + '\'' +
594		- ", lochia='" + lochia + '\'' +
595		- ", matrix='" + matrix + '\'' +
596		- ", wound='" + wound + '\'' +
597		- ", otherDesc='" + otherDesc + '\'' +
598		- ", healthType=" + healthType +
599		- ", guideSuggest='" + guideSuggest + '\'' +
600		- ", isRefer=" + isRefer +
601		- ", referReason='" + referReason + '\'' +
602		- ", referHospital='" + referHospital + '\'' +
603		- ", updateDate=" + updateDate +
604		- ", updateUser='" + updateUser + '\'' +
605		- '}';
	568	+ public Date getUpdateDateStr() {
	569	+ return updateDateStr;
	570	+ }
	571	+
	572	+ public void setUpdateDateStr(Date updateDateStr) {
	573	+ this.updateDateStr = updateDateStr;
606	574	}
607	575	}

...	...	@@ -3,14 +3,21 @@
3	3	import com.lyms.platform.common.enums.PostpartumFollowMakeEnums;
4	4	import com.lyms.platform.common.utils.BeanUtils;
5	5	import com.lyms.platform.common.utils.DateUtil;
	6	+import com.lyms.platform.common.utils.JsonUtil;
	7	+import com.lyms.platform.common.utils.StringUtils;
	8	+import com.lyms.platform.operate.web.utils.UnitConstants;
	9	+import com.lyms.platform.operate.web.utils.UnitUtils;
6	10	import com.lyms.platform.pojo.MatdeliverFollowModel;
	11	+import org.apache.commons.collections.MapUtils;
7	12
	13	+import java.util.Map;
	14	+
8	15	/**
9	16	* @auther yangfei
10	17	* @createTime 2017年11月27日 10时57分
11	18	* @discription
12	19	*/
13		-public class MatdeliverFollowResult extends MatdeliverFollowModel{
	20	+public class MatdeliverFollowResult extends MatdeliverFollowModel {
14	21
15	22	/**
16	23	* 预约联系结果（1-成功、2-失败）
...	...	@@ -75,7 +82,7 @@
75	82	/**
76	83	* 分娩日期
77	84	*/
78		- private String fmDateStr;
	85	+ private String deliveryDateStr;
79	86	/**
80	87	* 出院日期
81	88	*/
...	...	@@ -93,6 +100,14 @@
93	100	*/
94	101	private String woundStr;
95	102	/**
	103	+ * 血压信息
	104	+ */
	105	+ private String bpStr;
	106	+ /**
	107	+ * 血压MAP信息
	108	+ */
	109	+ private Map bpMap;
	110	+ /**
96	111	* 分类(1-未见异常、2-异常)
97	112	*/
98	113	private String healthTypeStr;
99	114
...	...	@@ -101,10 +116,18 @@
101	116	*/
102	117	private String guideSuggestStr;
103	118	/**
	119	+ * 指导意见Map
	120	+ */
	121	+ private Map guideSuggestMap;
	122	+ /**
104	123	* 是否转诊转诊（1-无、2-有）
105	124	*/
106	125	private String isReferStr;
107	126	/**
	127	+ * 转诊机构名称
	128	+ */
	129	+ private String referHospitalStr;
	130	+ /**
108	131	* 修改时间
109	132	*/
110	133	private String updateDateStr;
111	134
112	135
113	136
114	137
115	138
116	139
117	140
118	141
119	142
120	143
121	144
122	145
123	146
124	147
125	148
126	149
127	150
128	151
...	...	@@ -114,62 +137,236 @@
114	137	private String updateUserStr;
115	138
116	139	public MatdeliverFollowResult convertToResult(MatdeliverFollowModel matdeliverFollowModel) {
117		- BeanUtils.copy(matdeliverFollowModel,this);
118		- if(matdeliverFollowModel.getContactResult()!=null){
	140	+ BeanUtils.copy(matdeliverFollowModel, this);
	141	+ if (matdeliverFollowModel.getMakeCreateDate() != null) {
	142	+ makeCreateDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getMakeCreateDate());
	143	+ }
	144	+
	145	+ if (matdeliverFollowModel.getContactResult() != null) {
119	146	contactResultStr = PostpartumFollowMakeEnums.ResultEnum.getTitle(matdeliverFollowModel.getContactResult());
120	147	}
121		- if(matdeliverFollowModel.getMakeType()!=null){
122		- makeTypeStr = PostpartumFollowMakeEnums.TypeEnum.getTitle(matdeliverFollowModel.getMakeType());
	148	+ if (matdeliverFollowModel.getMakeType() != null) {
	149	+ makeTypeStr = PostpartumFollowMakeEnums.TypeEnum.getTitle(matdeliverFollowModel.getMakeType());
123	150	}
124		- if(matdeliverFollowModel.getContactReason()!=null){
	151	+ if (matdeliverFollowModel.getMakeVisitDate() != null) {
	152	+ makeVisitDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getMakeVisitDate());
	153	+ }
	154	+ if (matdeliverFollowModel.getContactReason() != null) {
125	155	contactReasonStr = PostpartumFollowMakeEnums.ReasonEnum.getTitle(matdeliverFollowModel.getContactReason());
126	156	}
127		- if(matdeliverFollowModel.getVisitResult()!=null){
	157	+ if (matdeliverFollowModel.getVisitResult() != null) {
128	158	visitResultStr = PostpartumFollowMakeEnums.ResultEnum.getTitle(matdeliverFollowModel.getVisitResult());
129	159	}
130		- if(matdeliverFollowModel.getVisitReason()!=null){
	160	+ if (matdeliverFollowModel.getVisitReason() != null) {
131	161	visitReasonStr = PostpartumFollowMakeEnums.ReasonEnum.getTitle(matdeliverFollowModel.getVisitReason());
132	162	}
133		- if(matdeliverFollowModel.getVisitStatus()!=null){
	163	+ if (matdeliverFollowModel.getVisitStatus() != null) {
134	164	visitStatusStr = PostpartumFollowMakeEnums.StatusEnum.getTitle(matdeliverFollowModel.getVisitStatus());
135	165	}
136		- if(matdeliverFollowModel.getVisitCreateDate()!=null){
	166	+ if (matdeliverFollowModel.getVisitCreateDate() != null) {
137	167	visitCreateDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getVisitCreateDate());
138	168	}
139		- if(matdeliverFollowModel.getNextVisitDate()!=null){
	169	+ if (matdeliverFollowModel.getNextVisitDate() != null) {
140	170	nextVisitDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getNextVisitDate());
141	171	}
142		- if(matdeliverFollowModel.getIsClose()!=null){
	172	+ if (matdeliverFollowModel.getVisitDate() != null) {
	173	+ visitDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getVisitDate());
	174	+ }
	175	+ if (matdeliverFollowModel.getIsClose() != null) {
143	176	isCloseStr = PostpartumFollowMakeEnums.IsCloseEnum.getTitle(matdeliverFollowModel.getIsClose());
144	177	}
145		- if(matdeliverFollowModel.getFmDate()!=null){
146		- fmDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getFmDate());
	178	+ if (matdeliverFollowModel.getDeliveryDate() != null) {
	179	+ deliveryDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getDeliveryDate());
147	180	}
148		- if(matdeliverFollowModel.getLeaveDate()!=null){
	181	+ if (matdeliverFollowModel.getLeaveDate() != null) {
149	182	leaveDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getLeaveDate());
150	183	}
151		- if(matdeliverFollowModel.getHealthType()!=null){
	184	+ if (matdeliverFollowModel.getHealthType() != null) {
152	185	healthTypeStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getHealthType());
153	186	}
154		- if(matdeliverFollowModel.getBreast()!=null){
	187	+ if (matdeliverFollowModel.getBreast() != null) {
155	188	breastStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getBreast());
156	189	}
157		- if(matdeliverFollowModel.getLochia()!=null){
	190	+ if (matdeliverFollowModel.getLochia() != null) {
158	191	lochiaStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getLochia());
159	192	}
160		- if(matdeliverFollowModel.getWound()!=null){
	193	+ if (matdeliverFollowModel.getWound() != null) {
161	194	woundStr = PostpartumFollowMakeEnums.ErrorTypeEnum.getTitle(matdeliverFollowModel.getWound());
162	195	}
163		- if(matdeliverFollowModel.getIsRefer()!=null){//（1-无、2-有）
164		- isReferStr = matdeliverFollowModel.getIsRefer() == 1?"无":"有";
	196	+ if (matdeliverFollowModel.getIsRefer() != null) {//（1-无、2-有）
	197	+ isReferStr = matdeliverFollowModel.getIsRefer() == 1 ? "无" : "有";
165	198	}
166		- if(matdeliverFollowModel.getUpdateDate()!=null){
	199	+ if (matdeliverFollowModel.getUpdateDate() != null) {
167	200	updateDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getUpdateDate());
168	201	}
169	202
	203	+ // 血压
	204	+ String ssy = "";
	205	+ String szy = "";
	206	+ if (StringUtils.isNotEmpty(getBp())) {
	207	+ bpMap = JsonUtil.getMap(getBp());
	208	+ if (MapUtils.isNotEmpty(bpMap)) {
	209	+ ssy = bpMap.get("ssy") + "";
	210	+ szy = bpMap.get("szy") + "";
	211	+ }
	212	+ bpStr = UnitUtils.unitSplice(ssy + "/" + szy, UnitConstants.MMHG);
	213	+ }
	214	+ if (StringUtils.isNotEmpty(getGuideSuggest())) {
	215	+ guideSuggestMap = JsonUtil.jkstr2Obj(getGuideSuggest(), Map.class);
	216	+ if (MapUtils.isNotEmpty(guideSuggestMap)) {
	217	+
	218	+ StringBuffer guideSuggestSb = new StringBuffer();
	219	+ //"{"grws":true,"xl":true,"yy":true,"mrwy":true}"
	220	+ if (guideSuggestMap.containsKey("grws") && guideSuggestMap.get("grws") != null) {
	221	+ if ("true".equals(guideSuggestMap.get("grws").toString())) {
	222	+ guideSuggestSb.append("个人卫生，");
	223	+ }
	224	+ }
	225	+
	226	+ if (guideSuggestMap.containsKey("xl") && guideSuggestMap.get("xl") != null) {
	227	+ if ("true".equals(guideSuggestMap.get("xl").toString())) {
	228	+ guideSuggestSb.append("心理，");
	229	+ }
	230	+ }
	231	+ if (guideSuggestMap.containsKey("yy") && guideSuggestMap.get("yy") != null) {
	232	+ if ("true".equals(guideSuggestMap.get("yy").toString())) {
	233	+ guideSuggestSb.append("营养，");
	234	+ }
	235	+ }
	236	+ if (guideSuggestMap.containsKey("mrwy") && guideSuggestMap.get("mrwy") != null) {
	237	+ if ("true".equals(guideSuggestMap.get("mrwy").toString())) {
	238	+ guideSuggestSb.append("母乳喂养，");
	239	+ }
	240	+ }
	241	+ if (guideSuggestMap.containsKey("ssehl") && guideSuggestMap.get("ssehl") != null) {
	242	+ if ("true".equals(guideSuggestMap.get("ssehl").toString())) {
	243	+ guideSuggestSb.append("新生儿护理及喂养，");
	244	+ }
	245	+ }
	246	+ if (guideSuggestMap.containsKey("qt") && guideSuggestMap.get("qt") != null) {
	247	+ if ("true".equals(guideSuggestMap.get("qt").toString())) {
	248	+ guideSuggestSb.append("其他：");
	249	+ }
	250	+ if (guideSuggestMap.get("qtText") != null) {
	251	+ guideSuggestSb.append(guideSuggestMap.get("qtText"));
	252	+ }
	253	+ }
	254	+
	255	+ if (guideSuggestSb.toString().endsWith("，")) {
	256	+ guideSuggestStr = guideSuggestSb.substring(0, guideSuggestSb.length() - 1);
	257	+ } else {
	258	+ guideSuggestStr = guideSuggestSb.toString();
	259	+ }
	260	+ }
	261	+ }
170	262	return this;
171	263	}
172	264
	265	+ public String getReferHospitalStr() {
	266	+ return referHospitalStr;
	267	+ }
	268	+
	269	+ public void setReferHospitalStr(String referHospitalStr) {
	270	+ this.referHospitalStr = referHospitalStr;
	271	+ }
	272	+
	273	+ public Map getGuideSuggestMap() {
	274	+ return guideSuggestMap;
	275	+ }
	276	+
	277	+ public void setGuideSuggestMap(Map guideSuggestMap) {
	278	+ this.guideSuggestMap = guideSuggestMap;
	279	+ }
	280	+
	281	+ public String getBpStr() {
	282	+ return bpStr;
	283	+ }
	284	+
	285	+ public void setBpStr(String bpStr) {
	286	+ this.bpStr = bpStr;
	287	+ }
	288	+
	289	+ public String getDeliveryDateStr() {
	290	+ return deliveryDateStr;
	291	+ }
	292	+
	293	+ public void setDeliveryDateStr(String deliveryDateStr) {
	294	+ this.deliveryDateStr = deliveryDateStr;
	295	+ }
	296	+
	297	+ public String getMakeVisitDateStr() {
	298	+ return makeVisitDateStr;
	299	+ }
	300	+
	301	+ public Map getBpMap() {
	302	+ return bpMap;
	303	+ }
	304	+
	305	+ public void setBpMap(Map bpMap) {
	306	+ this.bpMap = bpMap;
	307	+ }
	308	+
	309	+ public void setMakeVisitDateStr(String makeVisitDateStr) {
	310	+ this.makeVisitDateStr = makeVisitDateStr;
	311	+ }
	312	+
	313	+ public String getMakeCreateUserStr() {
	314	+ return makeCreateUserStr;
	315	+ }
	316	+
	317	+ public void setMakeCreateUserStr(String makeCreateUserStr) {
	318	+ this.makeCreateUserStr = makeCreateUserStr;
	319	+ }
	320	+
	321	+ public String getMakeCreateDateStr() {
	322	+ return makeCreateDateStr;
	323	+ }
	324	+
	325	+ public void setMakeCreateDateStr(String makeCreateDateStr) {
	326	+ this.makeCreateDateStr = makeCreateDateStr;
	327	+ }
	328	+
	329	+ public String getVisitDateStr() {
	330	+ return visitDateStr;
	331	+ }
	332	+
	333	+ public void setVisitDateStr(String visitDateStr) {
	334	+ this.visitDateStr = visitDateStr;
	335	+ }
	336	+
	337	+
	338	+ public String getBreastStr() {
	339	+ return breastStr;
	340	+ }
	341	+
	342	+ public void setBreastStr(String breastStr) {
	343	+ this.breastStr = breastStr;
	344	+ }
	345	+
	346	+ public String getLochiaStr() {
	347	+ return lochiaStr;
	348	+ }
	349	+
	350	+ public void setLochiaStr(String lochiaStr) {
	351	+ this.lochiaStr = lochiaStr;
	352	+ }
	353	+
	354	+ public String getWoundStr() {
	355	+ return woundStr;
	356	+ }
	357	+
	358	+ public void setWoundStr(String woundStr) {
	359	+ this.woundStr = woundStr;
	360	+ }
	361	+
	362	+ public String getGuideSuggestStr() {
	363	+ return guideSuggestStr;
	364	+ }
	365	+
	366	+ public void setGuideSuggestStr(String guideSuggestStr) {
	367	+ this.guideSuggestStr = guideSuggestStr;
	368	+ }
	369	+
173	370	public String getVisitCreateUserStr() {
174	371	return visitCreateUserStr;
175	372	}
...	...	@@ -258,14 +455,6 @@
258	455	this.isCloseStr = isCloseStr;
259	456	}
260	457
261		- public String getFmDateStr() {
262		- return fmDateStr;
263		- }
264		-
265		- public void setFmDateStr(String fmDateStr) {
266		- this.fmDateStr = fmDateStr;
267		- }
268		-
269	458	public String getLeaveDateStr() {
270	459	return leaveDateStr;
271	460	}
...	...	@@ -318,7 +507,6 @@
318	507	", visitCreateDateStr='" + visitCreateDateStr + '\'' +
319	508	", nextVisitDateStr='" + nextVisitDateStr + '\'' +
320	509	", isCloseStr='" + isCloseStr + '\'' +
321		- ", fmDateStr='" + fmDateStr + '\'' +
322	510	", leaveDateStr='" + leaveDateStr + '\'' +
323	511	", healthTypeStr='" + healthTypeStr + '\'' +
324	512	", isReferStr='" + isReferStr + '\'' +