jiangjiazhi / regional-platform

Commit 10b9ff1fd3c9dbd029ca6bd3f9e53c927e25b81e

Authored by rui.zhang over 9 years ago

2 parents 6d29207020 f2fb00e511

Exists in master and in 8 other branches

Merge remote-tracking branch 'origin/master'

Showing 14 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PuerperaService.java
platform-dal/src/main/java/com/lyms/platform/pojo/AssayConfig.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyVisitModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyManageController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VisitController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyVisitAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasePageQueryRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/VisitAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyVisitResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SimpleVisit.java
platform-operate-api/src/main/resources/message.properties

...	...	@@ -15,14 +15,14 @@
15	15	import com.lyms.platform.pojo.PuerperaModel;
16	16	import com.lyms.platform.query.PuerperaModelQuery;
17	17
18		-
19	18	@Service
20	19	public class PuerperaService {
21	20	@Autowired
22	21	private IPuerperaDao iPuerperaDao;
23		-
24		- public void addPuerpera(PuerperaModel obj) {
25		- iPuerperaDao.addPuerpera(obj);
	22	+
	23	+ public PuerperaModel addPuerpera(PuerperaModel obj) {
	24	+
	25	+ return iPuerperaDao.addPuerpera(obj);
26	26	}
27	27
28	28	public void updatePuerpera(PuerperaModel obj) {
29	29
30	30
31	31
...	...	@@ -38,23 +38,21 @@
38	38
39	39	return iPuerperaDao.queryPuerpera(query.addOrder(Direction.ASC, "id"));
40	40	}
41		-
	41	+
42	42	/**
43	43	* 根据身份证号码查询某一个患者
44	44	*
45	45	* @return
46	46	*/
47		- public PuerperaModel findOnePuerperaByCardNo(PuerperaModelQuery puerperaQuery){
48		-
49		-
50		-
	47	+ public PuerperaModel findOnePuerperaByCardNo(PuerperaModelQuery puerperaQuery) {
	48	+
51	49	return iPuerperaDao.queryPuerpera(puerperaQuery.convertToQuery()).get(0);
52	50	}
53	51
54		- public PuerperaModel findOnePuerperaById(String id){
	52	+ public PuerperaModel findOnePuerperaById(String id) {
55	53	return iPuerperaDao.getPuerpera(id);
56	54	}
57		-
	55	+
58	56	public List<PuerperaModel> queryByParentId(String parentId) {
59	57	return iPuerperaDao.queryPuerpera(MongoCondition.newInstance("parentId", parentId, MongoOper.IS).toMongoQuery());
60	58	}

...	...	@@ -2,10 +2,16 @@
2	2
3	3	import com.lyms.platform.common.result.BaseModel;
4	4
5		-public class AssayConfig extends BaseModel{
	5	+public class AssayConfig extends BaseModel {
	6	+ /**
	7	+ * 添加字段注释
	8	+ */
	9	+ private static final long serialVersionUID = 1L;
	10	+
6	11	private String id;
7	12
8	13	private String yn;
	14	+
9	15	private String print;
10	16
11	17	public String getPrint() {

...	...	@@ -116,7 +116,7 @@
116	116	private String shit;
117	117
118	118	// 大便次数
119		- private int shitTimeOfDay;
	119	+ private int shitTimes;
120	120
121	121	// 体温
122	122	private double temperature;
123	123
...	...	@@ -420,12 +420,12 @@
420	420	this.shit = shit;
421	421	}
422	422
423		- public int getShitTimeOfDay() {
424		- return shitTimeOfDay;
	423	+ public int getShitTimes() {
	424	+ return shitTimes;
425	425	}
426	426
427		- public void setShitTimeOfDay(int shitTimeOfDay) {
428		- this.shitTimeOfDay = shitTimeOfDay;
	427	+ public void setShitTimes(int shitTimes) {
	428	+ this.shitTimes = shitTimes;
429	429	}
430	430
431	431	public double getTemperature() {

1	1	package com.lyms.platform.pojo;
2	2
3		-import com.lyms.platform.common.core.annotation.form.Form;
4		-import com.lyms.platform.common.result.BaseModel;
	3	+import javax.validation.constraints.NotNull;
	4	+
5	5	import org.hibernate.validator.constraints.NotEmpty;
6	6	import org.springframework.data.annotation.Id;
7	7	import org.springframework.data.mongodb.core.mapping.Document;
8	8
9		-import javax.validation.constraints.NotNull;
	9	+import com.lyms.platform.common.core.annotation.form.Form;
	10	+import com.lyms.platform.common.result.BaseModel;
10	11
11	12	/**
12	13	* Created by Zhang.Rui on 2016/3/17.
...	...	@@ -15,6 +16,10 @@
15	16	@Form
16	17	@Document
17	18	public class ReferValue extends BaseModel{
	19	+ /**
	20	+ * TODO 添加字段注释
	21	+ */
	22	+ private static final long serialVersionUID = 1L;
18	23	@Id
19	24	private String id;
20	25	@NotNull(message = "医院ID不能为空")

...	...	@@ -49,7 +49,7 @@
49	49	*/
50	50	private int visitstatus = -1;
51	51
52		- private int yn;
	52	+ private int yn= -1;
53	53
54	54	public int getYn() {
55	55	return yn;
56	56
...	...	@@ -126,13 +126,16 @@
126	126	if (null != id) {
127	127	condition = condition.and("id", id, MongoOper.IS);
128	128	}
	129	+ if(-1!=yn){
	130	+ condition = condition.and("yn", yn, MongoOper.IS);
	131	+ }
129	132	/*
130	133	* if(null!=keyword){ if(null!=keyword){ MongoCondition con1= MongoCondition.newInstance("phone", keyword, MongoOper.LIKE); MongoCondition con
131	134	* = MongoCondition.newInstance("name", keyword, MongoOper.LIKE); condition = condition.orCondition(new MongoCondition[]{con1,con}); } }
132	135	*/
133	136
134	137	if (null != parentId) {
135		- condition = condition.and("parentId", parentId, MongoOper.IS);
	138	+ condition = condition.and("parentid", parentId, MongoOper.IS);
136	139	}
137	140
138	141	Criteria c = null;

...	...	@@ -36,7 +36,7 @@
36	36	/**
37	37	* 新生儿管理查询接口
38	38	*
39		- * @param managerRequest 新生儿查询请求
	39	+ * @param babyManagerRequest 新生儿查询请求
40	40	*
41	41	* @return
42	42	*/

...	...	@@ -32,7 +32,7 @@
32	32	/**
33	33	* 根据身份证获取产妇信息
34	34	*
35		- * @param cardno
	35	+ * @param puerperaVisitQueryRequest
36	36	* 身份证号码
37	37	* @return 返回结果
38	38	*/
39	39
...	...	@@ -75,13 +75,13 @@
75	75	@RequestMapping(value = "/visitbaby", method = RequestMethod.POST)
76	76	public BaseResponse addOneBabyVisit(@Valid
77	77	BabyVisitAddRequest babyVisitAddRequest) {
78		- return visitFacade.addOneBabyVisit(babyVisitAddRequest);
	78	+ return visitFacade.addOrUpdateBabyAndVisit(babyVisitAddRequest);
79	79	}
80	80
81	81	/**
82	82	* 根据产妇身份证号获取小孩的访视信息
83	83	*
84		- * @param PuerperaVisitQueryRequest
	84	+ * @param puerperaVisitQueryRequest
85	85	* 访视记录查询
86	86	* @return
87	87	*/

...	...	@@ -27,6 +27,7 @@
27	27	import com.lyms.platform.pojo.BabyVisitModel;
28	28	import com.lyms.platform.pojo.PuerperaModel;
29	29	import com.lyms.platform.pojo.VisitModel;
	30	+import com.lyms.platform.query.BabyModelQuery;
30	31	import com.lyms.platform.query.PuerperaModelQuery;
31	32	import com.lyms.platform.query.VisitQuery;
32	33
33	34
34	35
...	...	@@ -135,18 +136,23 @@
135	136	if (!destModel.equals(srcModel)) {
136	137	puerperaService.updatePuerpera(visitRequest.getPuerpera().build());
137	138	}
138		- // 如果为空表示新增
139		- if (StringUtils.isEmpty(visitRequest.getRequestVisit().getId())) {
140		- visitService.addVisit(visitRequest.getRequestVisit());
141		- } else {
142		- visitService.updateVisit(visitRequest.getRequestVisit());
143		- }
144		- return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
145	139	} else {
146	140	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("产妇信息不存在");
147	141	}
	142	+ } else {
	143	+ // 表示是新的产妇直接新增
	144	+ parentId = puerperaService.addPuerpera(visitRequest.getPuerpera().build()).getId();
148	145	}
149		- return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("产妇id不能为空");
	146	+ // 如果为空表示新增
	147	+ if (StringUtils.isEmpty(visitRequest.getRequestVisit().getId())) {
	148	+ if (StringUtils.isNotEmpty(parentId)) {
	149	+ visitRequest.getRequestVisit().setParentId(parentId);
	150	+ }
	151	+ visitService.addVisit(visitRequest.getRequestVisit());
	152	+ } else {
	153	+ visitService.updateVisit(visitRequest.getRequestVisit());
	154	+ }
	155	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
150	156	}
151	157
152	158	/**
153	159
...	...	@@ -189,16 +195,23 @@
189	195	}
190	196
191	197	private BaseObjectResponse findBabyVisit(PuerperaModel puerperaModel) {
192		- // 根据产妇id查询该产妇下的小孩访视
193		- List<BabyVisitModel> babyVisits = babyVisitService.findAllVisitByParentId(puerperaModel.getId());
194		-
195		- // 数据转换
	198	+ BabyModelQuery babyQuery = new BabyModelQuery();
	199	+ babyQuery.setParentId(puerperaModel.getId());
	200	+ babyQuery.setYn(YnEnums.YES.getId());
	201	+ List<BabyModel> babies= babyService.queryBabyWithQuery(babyQuery);
196	202	BabyVisitResult babyVisitResult = new BabyVisitResult();
197	203	List<BabyVisitResult.BabyVisit> data = new ArrayList<BabyVisitResult.BabyVisit>();
198		- for (BabyVisitModel visit : babyVisits) {
199		- BabyVisit babyVisit = babyVisitResult.new BabyVisit();
200		- // 转换小孩的访视数据
201		- data.add(babyVisit.convertToResult(visit));
	204	+ for(BabyModel bModel:babies){
	205	+ // 根据产妇id查询该产妇下的小孩访视
	206	+ List<BabyVisitModel> babyVisits = babyVisitService.findAllVisitByParentId(bModel.getId());
	207	+
	208	+ // 数据转换
	209	+
	210	+ for (BabyVisitModel visit : babyVisits) {
	211	+ BabyVisit babyVisit = babyVisitResult.new BabyVisit();
	212	+ // 转换小孩的访视数据
	213	+ data.add(babyVisit.convertToResult(visit));
	214	+ }
202	215	}
203	216
204	217	// TODO 需要转换成具体的result对象

1	1	package com.lyms.platform.operate.web.request;
2	2
3		-import java.util.Date;
4		-
5	3	import com.lyms.platform.common.base.IBasicRequestConvert;
6	4	import com.lyms.platform.common.core.annotation.form.Form;
	5	+import com.lyms.platform.common.utils.DateUtil;
7	6	import com.lyms.platform.pojo.BabyVisitModel;
8	7
9	8	@Form
...	...	@@ -23,7 +22,7 @@
23	22	private int sex;
24	23
25	24	// 生日
26		- private Date birth;
	25	+ private String birth;
27	26
28	27	// 父亲信息
29	28	private String fname;
...	...	@@ -41,7 +40,7 @@
41	40
42	41	private String mphone;
43	42
44		- private Date mbirth;
	43	+ private String mbirth;
45	44
46	45	private int week;
47	46
...	...	@@ -91,7 +90,7 @@
91	90	private String shit;
92	91
93	92	// 大便次数
94		- private int shitTimeOfDay;
	93	+ private int shitTimes;
95	94
96	95	// 体温
97	96	private double temperature;
...	...	@@ -106,7 +105,7 @@
106	105	private String complexion;
107	106
108	107	// 黄疸部位
109		- private String JaundiceParts;
	108	+ private String jaundiceParts;
110	109
111	110	// 前卤
112	111	private String bregma;
...	...	@@ -115,7 +114,7 @@
115	114	private String eye;
116	115
117	116	// 四肢活动度
118		- private String LimbsActivity;
	117	+ private String limbsActivity;
119	118
120	119	// 耳外观
121	120	private String earAppearance;
122	121
...	...	@@ -160,13 +159,13 @@
160	159	private String guide;
161	160
162	161	// 本次访视时间
163		- private Date currentVisit;
	162	+ private String currentVisit;
164	163
165	164	// 下次随访地点
166	165	private String nextVisitAddr;
167	166
168	167	// 下次访视时间
169		- private Date nextVisitDate;
	168	+ private String nextVisitDate;
170	169
171	170	// 随访医生签名
172	171	private String doctorSign;
173	172
...	...	@@ -214,11 +213,11 @@
214	213	this.sex = sex;
215	214	}
216	215
217		- public Date getBirth() {
	216	+ public String getBirth() {
218	217	return birth;
219	218	}
220	219
221		- public void setBirth(Date birth) {
	220	+ public void setBirth(String birth) {
222	221	this.birth = birth;
223	222	}
224	223
225	224
...	...	@@ -278,11 +277,11 @@
278	277	this.mphone = mphone;
279	278	}
280	279
281		- public Date getMbirth() {
	280	+ public String getMbirth() {
282	281	return mbirth;
283	282	}
284	283
285		- public void setMbirth(Date mbirth) {
	284	+ public void setMbirth(String mbirth) {
286	285	this.mbirth = mbirth;
287	286	}
288	287
289	288
...	...	@@ -414,12 +413,12 @@
414	413	this.shit = shit;
415	414	}
416	415
417		- public int getShitTimeOfDay() {
418		- return shitTimeOfDay;
	416	+ public int getShitTimes() {
	417	+ return shitTimes;
419	418	}
420	419
421		- public void setShitTimeOfDay(int shitTimeOfDay) {
422		- this.shitTimeOfDay = shitTimeOfDay;
	420	+ public void setShitTimes(int shitTimes) {
	421	+ this.shitTimes = shitTimes;
423	422	}
424	423
425	424	public double getTemperature() {
426	425
...	...	@@ -455,11 +454,11 @@
455	454	}
456	455
457	456	public String getJaundiceParts() {
458		- return JaundiceParts;
	457	+ return jaundiceParts;
459	458	}
460	459
461	460	public void setJaundiceParts(String jaundiceParts) {
462		- JaundiceParts = jaundiceParts;
	461	+ this.jaundiceParts = jaundiceParts;
463	462	}
464	463
465	464	public String getBregma() {
466	465
...	...	@@ -479,11 +478,11 @@
479	478	}
480	479
481	480	public String getLimbsActivity() {
482		- return LimbsActivity;
	481	+ return limbsActivity;
483	482	}
484	483
485	484	public void setLimbsActivity(String limbsActivity) {
486		- LimbsActivity = limbsActivity;
	485	+ this.limbsActivity = limbsActivity;
487	486	}
488	487
489	488	public String getEarAppearance() {
...	...	@@ -598,14 +597,6 @@
598	597	this.guide = guide;
599	598	}
600	599
601		- public Date getCurrentVisit() {
602		- return currentVisit;
603		- }
604		-
605		- public void setCurrentVisit(Date currentVisit) {
606		- this.currentVisit = currentVisit;
607		- }
608		-
609	600	public String getNextVisitAddr() {
610	601	return nextVisitAddr;
611	602	}
612	603
...	...	@@ -614,11 +605,19 @@
614	605	this.nextVisitAddr = nextVisitAddr;
615	606	}
616	607
617		- public Date getNextVisitDate() {
	608	+ public String getCurrentVisit() {
	609	+ return currentVisit;
	610	+ }
	611	+
	612	+ public void setCurrentVisit(String currentVisit) {
	613	+ this.currentVisit = currentVisit;
	614	+ }
	615	+
	616	+ public String getNextVisitDate() {
618	617	return nextVisitDate;
619	618	}
620	619
621		- public void setNextVisitDate(Date nextVisitDate) {
	620	+ public void setNextVisitDate(String nextVisitDate) {
622	621	this.nextVisitDate = nextVisitDate;
623	622	}
624	623
625	624
626	625
...	...	@@ -632,13 +631,70 @@
632	631
633	632	public BabyVisitModel convertToDataModel() {
634	633	BabyVisitModel babyVisitModel = new BabyVisitModel();
	634	+ babyVisitModel.setName(name);
	635	+ babyVisitModel.setSex(sex);
	636	+ babyVisitModel.setBirth(DateUtil.parseYMD(birth));
	637	+ babyVisitModel.setMbirth(DateUtil.parseYMD(mbirth));
	638	+ babyVisitModel.setMjob(mjob);
	639	+ babyVisitModel.setMname(mname);
	640	+ babyVisitModel.setMphone(mphone);
	641	+ babyVisitModel.setFbirth(DateUtil.parseYMD(fbirth));
	642	+ babyVisitModel.setFjob(fjob);
	643	+ babyVisitModel.setFname(fname);
	644	+ babyVisitModel.setFphone(fphone);
635	645	babyVisitModel.setAbdominalPalpation(abdominalPalpation);
636	646	babyVisitModel.setAnus(anus);
637	647	babyVisitModel.setAuscultation(auscultation);
638	648	babyVisitModel.setBackbone(backbone);
639		- babyVisitModel.setBirth(birth);
	649	+ babyVisitModel.setBirth(DateUtil.parseYMD(birth));
640	650	babyVisitModel.setBirthSituation(birthSituation);
641	651	babyVisitModel.setBirthWeight(birthWeight);
	652	+ babyVisitModel.setNextVisitAddr(nextVisitAddr);
	653	+ babyVisitModel.setWeek(week);
	654	+ babyVisitModel.setSickenInfo(sickenInfo);
	655	+ babyVisitModel.setOrg(org);
	656	+ babyVisitModel.setBirthSituation(birthSituation);
	657	+ babyVisitModel.setNeonatalAsphyxia(neonatalAsphyxia);
	658	+ babyVisitModel.setDeformity(deformity);
	659	+ babyVisitModel.setHearing(hearing);
	660	+ babyVisitModel.setDisease(disease);
	661	+ babyVisitModel.setBirthWeight(birthWeight);
	662	+ babyVisitModel.setWeight(weight);
	663	+ babyVisitModel.setHeight(height);
	664	+ babyVisitModel.setFeedType(feedType);
	665	+ babyVisitModel.setEatMilk(eatMilk);
	666	+ babyVisitModel.setEatTime(eatTime);
	667	+ babyVisitModel.setEmesis(emesis);
	668	+ babyVisitModel.setShit(shit);
	669	+ babyVisitModel.setShitTimes(shitTimes);
	670	+ babyVisitModel.setTemperature(temperature);
	671	+ babyVisitModel.setHeartRate(heartRate);
	672	+ babyVisitModel.setRespiratoryRate(respiratoryRate);
	673	+ babyVisitModel.setComplexion(complexion);
	674	+ babyVisitModel.setJaundiceParts(jaundiceParts);
	675	+ babyVisitModel.setBregma(bregma);
	676	+ babyVisitModel.setEye(eye);
	677	+ babyVisitModel.setLimbsActivity(limbsActivity);
	678	+ babyVisitModel.setEarAppearance(earAppearance);
	679	+ babyVisitModel.setCervicalMass(cervicalMass);
	680	+ babyVisitModel.setNose(nose);
	681	+ babyVisitModel.setSkin(skin);
	682	+ babyVisitModel.setMouthCavity(mouthCavity);
	683	+ babyVisitModel.setAnus(anus);
	684	+ babyVisitModel.setAuscultation(auscultation);
	685	+ babyVisitModel.setBreast(breast);
	686	+ babyVisitModel.setAbdominalPalpation(abdominalPalpation);
	687	+ babyVisitModel.setBackbone(backbone);
	688	+ babyVisitModel.setPudendum(pudendum);
	689	+ babyVisitModel.setFunicle(funicle);
	690	+ babyVisitModel.setReferralAdvice(referralAdvice);
	691	+ babyVisitModel.setGuide(guide);
	692	+ babyVisitModel.setCurrentVisit(DateUtil.parseYMD(currentVisit));
	693	+ babyVisitModel.setNextVisitAddr(nextVisitAddr);
	694	+ babyVisitModel.setNextVisitDate(DateUtil.parseYMD(nextVisitDate));
	695	+ babyVisitModel.setDoctorSign(doctorSign);
	696	+ babyVisitModel.setParentId(parentId);
	697	+ babyVisitModel.setId(id);
642	698	return babyVisitModel;
643	699	}
644	700	}

...	...	@@ -8,37 +8,40 @@
8	8	import com.lyms.platform.common.result.BaseModel;
9	9
10	10	/**
11		- *
12	11	* 分页查询的基础请求
13	12	*
14	13	* @author Administrator
15		- *
16	14	*/
17	15	public class BasePageQueryRequest extends BaseModel {
18		-
	16	+
19	17	/**
20	18	*
21	19	*/
22	20	private static final long serialVersionUID = 1L;
23		-
24		- @Min(value=1,message="page.min")
	21	+
	22	+ @Min(value = 1, message = "page.min")
25	23	@FormParam
26		- @NotNull(message="page.must.not.null")
	24	+ @NotNull(message = "page.not.null")
27	25	protected Integer page;
28		- @NotNull(message="page.limit.must.not.null")
29		- @Min(value=1,message="page.min")
30		- @Max(value=40,message="page.max")
	26	+
	27	+ @NotNull(message = "page.limit.not.null")
	28	+ @Min(value = 1, message = "page.min")
	29	+ @Max(value = 40, message = "page.max")
31	30	@FormParam
32	31	protected Integer limit;
	32	+
33	33	public Integer getPage() {
34	34	return page;
35	35	}
	36	+
36	37	public void setPage(Integer page) {
37	38	this.page = page;
38	39	}
	40	+
39	41	public Integer getLimit() {
40	42	return limit;
41	43	}
	44	+
42	45	public void setLimit(Integer limit) {
43	46	this.limit = limit;
44	47	}

1	1	package com.lyms.platform.operate.web.request;
2	2
3	3	import java.util.Date;
4		-import java.util.Map;
5	4
	5	+import javax.validation.constraints.Max;
	6	+import javax.validation.constraints.Min;
	7	+import javax.validation.constraints.NotNull;
	8	+
	9	+import org.hibernate.validator.constraints.NotEmpty;
	10	+
	11	+import com.lyms.platform.common.core.annotation.form.Form;
6	12	import com.lyms.platform.common.core.annotation.form.FormParam;
7	13	import com.lyms.platform.common.utils.DateUtil;
8	14	import com.lyms.platform.common.utils.JsonUtil;
...	...	@@ -14,7 +20,7 @@
14	20	*
15	21	* @author Administrator
16	22	*/
17		-@SuppressWarnings("rawtypes")
	23	+@Form
18	24	public class VisitAddRequest {
19	25
20	26	// 产妇基本信息 start
21	27
22	28
...	...	@@ -26,17 +32,22 @@
26	32	/**
27	33	* 产妇名称
28	34	*/
	35	+ @NotEmpty(message = "产妇名称不能为空")
29	36	private String name;
30	37
31	38	/**
32	39	* 产妇年龄
33	40	*/
	41	+ @NotNull(message = "page.limit.must.not.null")
	42	+ @Min(value = 1, message = "page.min")
	43	+ @Max(value = 40, message = "page.max")
34	44	private int age;
35	45
36	46	/**
37	47	* 产妇身份证号码
38	48	*/
39	49	@FormParam("cardno")
	50	+ @NotEmpty(message = "产妇名称不能为空")
40	51	private String cardNo;
41	52
42	53	/**
...	...	@@ -60,7 +71,7 @@
60	71	/**
61	72	* 地址
62	73	*/
63		- private Map address;
	74	+ private String address;
64	75
65	76	// 产妇基本信息 end
66	77	/**
67	78
68	79
...	...	@@ -138,19 +149,19 @@
138	149	/**
139	150	* 指导
140	151	*/
141		- private Map guide;
	152	+ private String guide;
142	153
143	154	/**
144	155	* 血压
145	156	*/
146	157	// private Bp bp;
147		- private Map bp;
	158	+ private String bp;
148	159
149	160	/**
150	161	* 转诊
151	162	*/
152	163	// private Referral referral;
153		- private Map referral;
	164	+ private String referral;
154	165
155	166	/**
156	167	* 类型
157	168
...	...	@@ -210,11 +221,11 @@
210	221	this.deliverOrg = deliverOrg;
211	222	}
212	223
213		- public Map getAddress() {
	224	+ public String getAddress() {
214	225	return address;
215	226	}
216	227
217		- public void setAddress(Map address) {
	228	+ public void setAddress(String address) {
218	229	this.address = address;
219	230	}
220	231
221	232
222	233
223	234
224	235
225	236
...	...	@@ -338,27 +349,27 @@
338	349	this.other = other;
339	350	}
340	351
341		- public Map getGuide() {
	352	+ public String getGuide() {
342	353	return guide;
343	354	}
344	355
345		- public void setGuide(Map guide) {
	356	+ public void setGuide(String guide) {
346	357	this.guide = guide;
347	358	}
348	359
349		- public Map getBp() {
	360	+ public String getBp() {
350	361	return bp;
351	362	}
352	363
353		- public void setBp(Map bp) {
	364	+ public void setBp(String bp) {
354	365	this.bp = bp;
355	366	}
356	367
357		- public Map getReferral() {
	368	+ public String getReferral() {
358	369	return referral;
359	370	}
360	371
361		- public void setReferral(Map referral) {
	372	+ public void setReferral(String referral) {
362	373	this.referral = referral;
363	374	}
364	375
...	...	@@ -403,7 +414,7 @@
403	414
404	415	visit.setBreast(breast);
405	416	visit.setChecktime(checktime);
406		- visit.setDays(days);
	417	+ visit.setDays(DateUtil.getDays(DateUtil.parseYMD(dueDate), DateUtil.parseYMD(checktime)) + "");
407	418	visit.setDoctorsign(doctorsign);
408	419	visit.setDue(due);
409	420	visit.setHealth(health);

...	...	@@ -689,15 +689,67 @@
689	689
690	690	@Override
691	691	public BabyVisit convertToResult(BabyVisitModel destModel) {
	692	+
	693	+ setMbirth(DateUtil.getYmd(destModel.getMbirth()));
	694	+ setmName(destModel.getMname());
	695	+ setMjob(destModel.getMjob());
	696	+ setMphone(destModel.getMphone());
	697	+ setId(destModel.getId());
	698	+ setName(destModel.getName());
	699	+ setsNumber(destModel.getsNumber());
	700	+ setSex(destModel.getSex());
	701	+ setBirth(DateUtil.getyyyy_MM_dd(destModel.getBirth()));
	702	+ setFname(destModel.getFname());
	703	+ setFbirth(DateUtil.getYmd(destModel.getFbirth()));
	704	+ setFjob(destModel.getFjob());
	705	+ setFphone(destModel.getFphone());
	706	+ setWeek(destModel.getWeek());
	707	+ setSickenInfo(destModel.getSickenInfo());
	708	+ setOrg(destModel.getOrg());
	709	+ setBirthSituation(destModel.getBirthSituation());
	710	+ setNeonatalAsphyxia(destModel.getNeonatalAsphyxia());
	711	+ setDeformity(destModel.getDeformity());
	712	+
	713	+ setHearing(destModel.getHearing());
	714	+ setDisease(destModel.getDisease()+"");
	715	+ setBirthWeight(destModel.getBirthWeight());
	716	+ setWeight(destModel.getWeight());
	717	+ setHeight(destModel.getHeight());
	718	+ setFeedType(destModel.getFeedType());
	719	+ setEatMilk(destModel.getEatMilk());
	720	+ setEatTime(destModel.getEatTime());
	721	+ setEmesis(destModel.getEmesis());
	722	+ setEarAppearance(destModel.getEarAppearance());
	723	+ setShit(destModel.getShit());
	724	+ setShitTimes(destModel.getShitTimes());
	725	+ setSkin(destModel.getSkin());
	726	+ setNose(destModel.getNose());
	727	+ setNextVisitAddr(destModel.getNextVisitAddr());
	728	+ setNextVisitDate(DateUtil.getYmd(destModel.getNextVisitDate()));
	729	+ setCervicalMass(destModel.getCervicalMass());
	730	+ setComplexion(destModel.getComplexion());
	731	+ setCurrentVisit(DateUtil.getYmd(destModel.getCurrentVisit()));
	732	+ setDoctorSign(destModel.getDoctorSign());
	733	+ setEye(destModel.getEye());
	734	+ setFunicle(destModel.getFunicle());
	735	+ setJaundiceParts(destModel.getJaundiceParts());
	736	+ setLimbsActivity(destModel.getLimbsActivity());
	737	+ setmName(destModel.getMname());
	738	+ setMouthCavity(destModel.getMouthCavity());
	739	+ setPudendum(destModel.getPudendum());
	740	+ setReferralAdvice(destModel.getReferralAdvice());
	741	+ setsNumber(destModel.getsNumber());
692	742	setAbdominalPalpation(destModel.getAbdominalPalpation());
693	743	setAnus(destModel.getAnus());
694	744	setAuscultation(destModel.getAuscultation());
695	745	setBackbone(destModel.getBackbone());
696		- setBirth(DateUtil.getyyyy_MM_dd(destModel.getBirth()));
	746	+ setMname(destModel.getMname());
697	747	setBirthSituation(destModel.getBirthSituation());
698		- setBirthWeight(destModel.getBirthWeight());
	748	+ setFunicle(destModel.getFunicle());
	749	+ setGuide(destModel.getGuide());
699	750	setBreast(destModel.getBreast());
700	751	setBregma(destModel.getBregma());
	752	+ setParentId(destModel.getParentId());
701	753	return this;
702	754	}
703	755	}
...	...	@@ -707,6 +759,7 @@
707	759	setAge(destModel.getAge());
708	760	setmCardNo(destModel.getCardNo());
709	761	setmName(destModel.getName());
	762	+
710	763	return this;
711	764	}
712	765	}

...	...	@@ -6,6 +6,7 @@
6	6
7	7	import com.lyms.platform.common.utils.JsonUtil;
8	8	import com.lyms.platform.pojo.VisitModel;
	9	+
9	10	@SuppressWarnings("rawtypes")
10	11	public class SimpleVisit {
11	12
12	13
...	...	@@ -87,13 +88,13 @@
87	88	/**
88	89	* 血压
89	90	*/
90		-// private Bp bp;
	91	+ // private Bp bp;
91	92	private Map bp;
92	93
93	94	/**
94	95	* 转诊
95	96	*/
96		-// private Referral referral;
	97	+ // private Referral referral;
97	98	private Map referral;
98	99
99	100	/**
100	101
101	102
...	...	@@ -226,18 +227,14 @@
226	227	this.guide = guide;
227	228	}
228	229
229		- /* public Bp getBp() {
230		- return bp;
231		- }
	230	+ /*
	231	+ * public Bp getBp() { return bp; } public void setBp(Bp bp) { this.bp = bp; }
	232	+ */
232	233
233		- public void setBp(Bp bp) {
234		- this.bp = bp;
235		- }*/
	234	+ /*
	235	+ * public Referral getReferral() { return referral; }
	236	+ */
236	237
237		- /* public Referral getReferral() {
238		- return referral;
239		- }*/
240		-
241	238	public Map getBp() {
242	239	return bp;
243	240	}
...	...	@@ -265,8 +262,7 @@
265	262	public void setWound(String wound) {
266	263	this.wound = wound;
267	264	}
268		-
269		-
	265	+
270	266	public Map getReferral() {
271	267	return referral;
272	268	}
273	269
274	270
275	271
276	272
277	273
278	274
279	275
280	276
281	277
282	278
283	279
284	280
285	281
286	282
287	283
288	284
289	285
290	286
291	287
292	288
293	289
294	290
295	291
296	292
...	...	@@ -274,79 +270,100 @@
274	270	public SimpleVisit convertToResult(VisitModel model) {
275	271	try {
276	272	setBp(JsonUtil.str2Obj(model.getBp(), Map.class));
277		- setGuide(JsonUtil.str2Obj(model.getGuide(),Map.class));
278		- setReferral(JsonUtil.str2Obj(model.getReferral(),Map.class));
	273	+ setGuide(JsonUtil.str2Obj(model.getGuide(), Map.class));
	274	+ setReferral(JsonUtil.str2Obj(model.getReferral(), Map.class));
279	275	} catch (Exception e) {
280	276	}
281		-
	277	+
282	278	setBreast(model.getBreast());
283	279	setChecktime(model.getChecktime());
284	280	setDays(model.getDays());
285	281	setDoctorsign(model.getDoctorsign());
286		-
	282	+
287	283	setDue(model.getDue());
288	284	setHealth(StringUtils.isEmpty(model.getHealth()) ? UNKNOWN : model.getHealth());
289	285	setId(model.getId());
290	286	setLochia(model.getLochia());
291	287	setMatrix(model.getMatrix());
292	288	setNumOfLive(model.getNumOfLive());
293		-
	289	+ setMentality(model.getMentality());
	290	+ setNextvisit(model.getNextvisit());
	291	+ setOther(model.getOther());
	292	+ setType(model.getType());
	293	+ setWound(model.getWound());
294	294	return this;
295	295	}
	296	+
296	297	class Bp {
297	298	private String h;
	299	+
298	300	private String l;
299		-
300		- public Bp(String h,String l){
301		- this.h=h;
302		- this.l=l;
	301	+
	302	+ public Bp(String h, String l) {
	303	+ this.h = h;
	304	+ this.l = l;
303	305	}
304		- public Bp(){
	306	+
	307	+ public Bp() {
305	308	}
	309	+
306	310	public String getH() {
307	311	return h;
308	312	}
	313	+
309	314	public void setH(String h) {
310	315	this.h = h;
311	316	}
	317	+
312	318	public String getL() {
313	319	return l;
314	320	}
	321	+
315	322	public void setL(String l) {
316	323	this.l = l;
317	324	}
318	325	}
319		-
320		- class Referral{
	326	+
	327	+ class Referral {
321	328	private int check;
	329	+
322	330	private String dept;
	331	+
323	332	private String org;
	333	+
324	334	private String reason;
	335	+
325	336	public int getCheck() {
326	337	return check;
327	338	}
	339	+
328	340	public void setCheck(int check) {
329	341	this.check = check;
330	342	}
	343	+
331	344	public String getDept() {
332	345	return dept;
333	346	}
	347	+
334	348	public void setDept(String dept) {
335	349	this.dept = dept;
336	350	}
	351	+
337	352	public String getOrg() {
338	353	return org;
339	354	}
	355	+
340	356	public void setOrg(String org) {
341	357	this.org = org;
342	358	}
	359	+
343	360	public String getReason() {
344	361	return reason;
345	362	}
	363	+
346	364	public void setReason(String reason) {
347	365	this.reason = reason;
348	366	}
349		-
350	367	}
351	368	}

1	1	page.min=\u5206\u9875\u6570\u636E\u4E0D\u80FD\u5C0F\u4E8E1.
2	2	page.max=\u6BCF\u9875\u663E\u793A\u7684\u6570\u636E\u4E0D\u80FD\u5927\u4E8E40\u6761
3		-page.must.not.null=page\u4E0D\u80FD\u4E3A\u7A7A
4		-page.limit.must.not.null=limit\u4E0D\u80FD\u4E3A\u7A7A
	3	+page.not.null=page\u4E0D\u80FD\u4E3A\u7A7A
	4	+page.limit.not.null=limit\u4E0D\u80FD\u4E3A\u7A7A