jiangjiazhi / regional-platform

Commit 4d92f13f3612881bf8c55709369d0823ca083bff

Authored by liquanyu about 9 years ago

Exists in master and in 8 other branches

Merge remote-tracking branch 'origin/master'

Showing 19 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/RiskDefaultTypeEnum.java
platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java
platform-dal/src/main/java/com/lyms/platform/pojo/BasicConfig.java
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-dal/src/main/java/com/lyms/platform/query/AntExChuQuery.java
platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ApplyOrderController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+/**
	4	+ * Created by Administrator on 2016/6/22 0022.
	5	+ */
	6	+public enum RiskDefaultTypeEnum {
	7	+ Orange("橙色","orange"),
	8	+ Yellow("黄色","yellow"),
	9	+ Red("红色","red"),
	10	+ Purple("紫色","purple")
	11	+ ;
	12	+
	13	+ private RiskDefaultTypeEnum(String title, String color) {
	14	+ this.color = color;
	15	+ this.title = title;
	16	+ }
	17	+
	18	+ private String title;
	19	+ private String color;
	20	+
	21	+ public String getTitle() {
	22	+ return title;
	23	+ }
	24	+
	25	+ public void setTitle(String title) {
	26	+ this.title = title;
	27	+ }
	28	+
	29	+ public String getColor() {
	30	+ return color;
	31	+ }
	32	+
	33	+ public void setColor(String color) {
	34	+ this.color = color;
	35	+ }
	36	+}

...	...	@@ -59,5 +59,13 @@
59	59	public static final String YSFYS = "5769eef90cf22c3157577422";
60	60	//本次妊娠
61	61	public static final String BCRS = "5769eef90cf22c3157577422";
	62	+
	63	+ // 高危风险(new)
	64	+ public static final String GWFX_NEW = "6A09E3B0-8418-47CA-A846-55514EE08A24";
	65	+
	66	+ // 高危风险类型的类型(typeId)
	67	+ public static final String GWFX_NEW_COLOR_TYPE_ID = "TYPE-GWFX-NEW";
	68	+
	69	+
62	70	}

...	...	@@ -33,6 +33,25 @@
33	33	private Long createDate;
34	34	private Long modifiedDate;
35	35
	36	+ private Integer score;
	37	+ private String describe;
	38	+
	39	+ public Integer getScore() {
	40	+ return score;
	41	+ }
	42	+
	43	+ public void setScore(Integer score) {
	44	+ this.score = score;
	45	+ }
	46	+
	47	+ public String getDescribe() {
	48	+ return describe;
	49	+ }
	50	+
	51	+ public void setDescribe(String describe) {
	52	+ this.describe = describe;
	53	+ }
	54	+
36	55	public static long getSerialVersionUID() {
37	56	return serialVersionUID;
38	57	}

...	...	@@ -317,6 +317,8 @@
317	317	private Integer lastReportId;
318	318	//高危风险id
319	319	private List<String> riskFactorId;
	320	+ //建档时高危风险id
	321	+ private List<String> firstRiskFactorId;
320	322	//风险等级颜色
321	323	private String riskLevelId;
322	324	//高危评分值
...	...	@@ -329,6 +331,14 @@
329	331	private String husbandName;
330	332	private String husbandPhone;
331	333	private String vcCardNo;
	334	+
	335	+ public List<String> getFirstRiskFactorId() {
	336	+ return firstRiskFactorId;
	337	+ }
	338	+
	339	+ public void setFirstRiskFactorId(List<String> firstRiskFactorId) {
	340	+ this.firstRiskFactorId = firstRiskFactorId;
	341	+ }
332	342
333	343	public List<String> getRiskFactorId() {
334	344	return riskFactorId;

...	...	@@ -12,7 +12,16 @@
12	12	public class AntExChuQuery extends BaseQuery implements IConvertToNativeQuery {
13	13	private String parentId;
14	14	private Integer yn;
	15	+ private String id;
15	16
	17	+ public String getId() {
	18	+ return id;
	19	+ }
	20	+
	21	+ public void setId(String id) {
	22	+ this.id = id;
	23	+ }
	24	+
16	25	@Override
17	26	public MongoQuery convertToQuery() {
18	27	MongoCondition condition=MongoCondition.newInstance();
...	...	@@ -21,6 +30,9 @@
21	30	}
22	31	if(null!=yn){
23	32	condition= condition.and("yn",yn, MongoOper.IS);
	33	+ }
	34	+ if(null!=id){
	35	+ condition= condition.and("id",id, MongoOper.IS);
24	36	}
25	37	return condition.toMongoQuery();
26	38	}

...	...	@@ -21,6 +21,8 @@
21	21
22	22	private Integer enable;
23	23
	24	+ private String typeId;
	25	+
24	26	public Integer getEnable() {
25	27	return enable;
26	28	}
...	...	@@ -45,6 +47,9 @@
45	47	if (null != parentId) {
46	48	condition = condition.and("parentId", parentId, MongoOper.IS);
47	49	}
	50	+ if (null != typeId) {
	51	+ condition = condition.and("typeId", typeId, MongoOper.IS);
	52	+ }
48	53	if(null!=enable){
49	54	condition = condition.and("enable", enable, MongoOper.IS);
50	55	}
...	...	@@ -55,6 +60,14 @@
55	60	}
56	61
57	62	return condition.toMongoQuery();
	63	+ }
	64	+
	65	+ public String getTypeId() {
	66	+ return typeId;
	67	+ }
	68	+
	69	+ public void setTypeId(String typeId) {
	70	+ this.typeId = typeId;
58	71	}
59	72
60	73	public String getKeyword() {

...	...	@@ -5,25 +5,22 @@
5	5	import com.lyms.platform.common.dao.operator.MongoCondition;
6	6	import com.lyms.platform.common.dao.operator.MongoOper;
7	7	import com.lyms.platform.common.dao.operator.MongoQuery;
8		-import org.bson.types.ObjectId;
9	8	import org.springframework.data.mongodb.core.query.Criteria;
10	9
11	10	import java.util.Date;
12	11
13	12	/**
14		- *
15	13	* 产妇模型定义
16		- *
17		- * @author Administrator
18	14	*
	15	+ * @author Administrator
19	16	*/
20		-public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery{
21		-
	17	+public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
	18	+
22	19	private String id;
23	20
24		- /**
25		- * 关键字
26		- */
	21	+ /**
	22	+ * 关键字
	23	+ */
27	24	private String keyword;
28	25	/**
29	26	* 是否分配社区
30	27
31	28
...	...	@@ -49,20 +46,13 @@
49	46	/**
50	47	* 访视状态
51	48	*/
52		- private int visitstatus=-1;
	49	+ private int visitstatus = -1;
53	50
54	51	private String areaId;
55	52	//社区id
56	53	private String areaIdOrRestId;
57	54
58		- public String getAreaIdOrRestId() {
59		- return areaIdOrRestId;
60		- }
61	55
62		- public void setAreaIdOrRestId(String areaIdOrRestId) {
63		- this.areaIdOrRestId = areaIdOrRestId;
64		- }
65		-
66	56	/**
67	57	* 产妇手机号
68	58	*/
69	59
...	...	@@ -71,9 +61,9 @@
71	61	* 产妇分娩日期
72	62	*/
73	63	private Date dueDateStart;
74		-
	64	+
75	65	private Date dueDateEnd;
76		-
	66	+
77	67	/**
78	68	* 地址
79	69	*/
...	...	@@ -82,7 +72,7 @@
82	72	* 社区id
83	73	*/
84	74	private String communityId;
85		-
	75	+
86	76	/**
87	77	* 身份证号码
88	78	*/
89	79
90	80
91	81
92	82
93	83
94	84
95	85
96	86
...	...	@@ -101,41 +91,43 @@
101	91	* 生日
102	92	*/
103	93	private Date birthEnd;
	94	+ /**
	95	+ * 服务类型
	96	+ */
	97	+ private String serviceType;
104	98
105		- public String getAreaId() {
106		- return areaId;
107		- }
	99	+ private String serviceStatus;
108	100
109		- public void setAreaId(String areaId) {
110		- this.areaId = areaId;
111		- }
	101	+ /**
	102	+ * 风险等级
	103	+ */
	104	+ private String rLevel;
	105	+ /**
	106	+ * 高危评分
	107	+ */
	108	+ private String hScore;
	109	+ /**
	110	+ * 高危因素
	111	+ */
	112	+ private String rFactor;
112	113
113		- public Date getBirthEnd() {
114		- return birthEnd;
115		- }
116	114
117		- public void setBirthEnd(Date birthEnd) {
118		- this.birthEnd = birthEnd;
119		- }
120		-
121		- public Date getBirthStart() {
122		- return birthStart;
123		- }
124		-
125		- public void setBirthStart(Date birthStart) {
126		- this.birthStart = birthStart;
127		- }
128		-
129	115	/**
130	116	* 是否有效
131	117	*/
132		- private int yn=-1;
	118	+ private int yn = -1;
133	119	/**
134	120	* 1:孕妇,2:儿童
135	121	*/
136		- private int type=-1;
	122	+ private int type = -1;
137	123
	124	+ public String getServiceStatus() {
	125	+ return serviceStatus;
	126	+ }
138	127
	128	+ public void setServiceStatus(String serviceStatus) {
	129	+ this.serviceStatus = serviceStatus;
	130	+ }
139	131
140	132	public int getType() {
141	133	return type;
142	134
143	135
144	136
145	137
146	138
147	139
148	140
149	141
150	142
151	143
152	144
153	145
154	146
155	147
156	148
157	149
158	150
159	151
160	152
161	153
162	154
163	155
164	156
165	157
166	158
167	159
168	160
169	161
170	162
171	163
172	164
173	165
174	166
175	167
176	168
...	...	@@ -148,122 +140,234 @@
148	140	public String getCardNo() {
149	141	return cardNo;
150	142	}
	143	+
151	144	public void setCardNo(String cardNo) {
152	145	this.cardNo = cardNo;
153	146	}
	147	+
154	148	public int getVisitstatus() {
155	149	return visitstatus;
156	150	}
	151	+
157	152	public void setVisitstatus(int visitstatus) {
158	153	this.visitstatus = visitstatus;
159	154	}
	155	+
160	156	public String getKeyword() {
161	157	return keyword;
162	158	}
	159	+
163	160	public void setKeyword(String keyword) {
164	161	this.keyword = keyword;
165	162	}
	163	+
166	164	public Date getDueDateStart() {
167	165	return dueDateStart;
168	166	}
	167	+
169	168	public void setDueDateStart(Date dueDateStart) {
170	169	this.dueDateStart = dueDateStart;
171	170	}
	171	+
172	172	public Date getDueDateEnd() {
173	173	return dueDateEnd;
174	174	}
	175	+
175	176	public void setDueDateEnd(Date dueDateEnd) {
176	177	this.dueDateEnd = dueDateEnd;
177	178	}
178		-
179		-
180		-
	179	+
	180	+ public String getAreaIdOrRestId() {
	181	+ return areaIdOrRestId;
	182	+ }
	183	+
	184	+ public void setAreaIdOrRestId(String areaIdOrRestId) {
	185	+ this.areaIdOrRestId = areaIdOrRestId;
	186	+ }
	187	+
	188	+ public String gethScore() {
	189	+ return hScore;
	190	+ }
	191	+
	192	+ public void sethScore(String hScore) {
	193	+ this.hScore = hScore;
	194	+ }
	195	+
	196	+ public String getrFactor() {
	197	+ return rFactor;
	198	+ }
	199	+
	200	+ public void setrFactor(String rFactor) {
	201	+ this.rFactor = rFactor;
	202	+ }
	203	+
	204	+ public String getrLevel() {
	205	+ return rLevel;
	206	+ }
	207	+
	208	+ public void setrLevel(String rLevel) {
	209	+ this.rLevel = rLevel;
	210	+ }
	211	+
	212	+ public String getServiceType() {
	213	+ return serviceType;
	214	+ }
	215	+
	216	+ public void setServiceType(String serviceType) {
	217	+ this.serviceType = serviceType;
	218	+ }
	219	+
	220	+ public String getAreaId() {
	221	+ return areaId;
	222	+ }
	223	+
	224	+ public void setAreaId(String areaId) {
	225	+ this.areaId = areaId;
	226	+ }
	227	+
	228	+ public Date getBirthEnd() {
	229	+ return birthEnd;
	230	+ }
	231	+
	232	+ public void setBirthEnd(Date birthEnd) {
	233	+ this.birthEnd = birthEnd;
	234	+ }
	235	+
	236	+ public Date getBirthStart() {
	237	+ return birthStart;
	238	+ }
	239	+
	240	+ public void setBirthStart(Date birthStart) {
	241	+ this.birthStart = birthStart;
	242	+ }
	243	+
181	244	public int getYn() {
182	245	return yn;
183	246	}
	247	+
184	248	public void setYn(int yn) {
185	249	this.yn = yn;
186	250	}
	251	+
187	252	public String getName() {
188	253	return name;
189	254	}
	255	+
190	256	public void setName(String name) {
191	257	this.name = name;
192	258	}
	259	+
193	260	public int getAge() {
194	261	return age;
195	262	}
	263	+
196	264	public void setAge(int age) {
197	265	this.age = age;
198	266	}
	267	+
199	268	public String getPhone() {
200	269	return phone;
201	270	}
	271	+
202	272	public void setPhone(String phone) {
203	273	this.phone = phone;
204	274	}
205		-
	275	+
206	276	public String getAddress() {
207	277	return address;
208	278	}
	279	+
209	280	public void setAddress(String address) {
210	281	this.address = address;
211	282	}
	283	+
212	284	public String getCommunityId() {
213	285	return communityId;
214	286	}
	287	+
215	288	public void setCommunityId(String communityId) {
216	289	this.communityId = communityId;
217	290	}
	291	+
218	292	public MongoQuery convertToQuery() {
219		- MongoCondition condition = MongoCondition.newInstance();
220		- if(null!=keyword){
221		- MongoCondition con1= MongoCondition.newInstance("phone", "^"+keyword, MongoOper.LIKE);
222		- MongoCondition con = MongoCondition.newInstance("username", "^"+keyword, MongoOper.LIKE);
223		- condition = condition.orCondition(new MongoCondition[]{con1,con});
	293	+ MongoCondition condition = MongoCondition.newInstance();
	294	+ if (null != keyword) {
	295	+ MongoCondition con1 = MongoCondition.newInstance("phone", "^" + keyword, MongoOper.LIKE);
	296	+ MongoCondition con = MongoCondition.newInstance("username", "^" + keyword, MongoOper.LIKE);
	297	+ condition = condition.orCondition(new MongoCondition[]{con1, con});
224	298	}
225		- if(null!=areaIdOrRestId){
226		- MongoCondition con1= MongoCondition.newInstance("areaId", areaIdOrRestId, MongoOper.IS);
227		- MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS);
228		- condition=condition.orCondition(new MongoCondition[]{con1, con});
	299	+ if (null != areaIdOrRestId) {
	300	+ MongoCondition con1 = MongoCondition.newInstance("areaId", areaIdOrRestId, MongoOper.IS);
	301	+ MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS);
	302	+ condition = condition.orCondition(new MongoCondition[]{con1, con});
229	303	}
230		- if(visitstatus!=-1){
231		- condition= condition.and("isVisit", visitstatus, MongoOper.IS);
	304	+ if (visitstatus != -1) {
	305	+ condition = condition.and("isVisit", visitstatus, MongoOper.IS);
232	306	}
233		- if(null!=communityId&&!"-1".equals(communityId)){
234		- condition= condition.and("communityId", communityId, MongoOper.IS);
	307	+ if (null != communityId && !"-1".equals(communityId)) {
	308	+ condition = condition.and("communityId", communityId, MongoOper.IS);
235	309	}
236		- if(null!=areaId){
237		- condition= condition.and("areaId", areaId, MongoOper.IS);
	310	+ if (null != areaId) {
	311	+ condition = condition.and("areaId", areaId, MongoOper.IS);
238	312	}
239		- if(null!=id){
240		- condition= condition.and("id", id, MongoOper.IS);
	313	+ if (null != id) {
	314	+ condition = condition.and("id", id, MongoOper.IS);
241	315	}
242		- if(null!=vcCardNo){
243		- condition= condition.and("vcCardNo", vcCardNo, MongoOper.IS);
	316	+ if (null != vcCardNo) {
	317	+ condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
244	318	}
245		- if(null!=cardNo){
246		- condition=condition.and("cardno", cardNo, MongoOper.IS);
	319	+ if (null != cardNo) {
	320	+ condition = condition.and("cardno", cardNo, MongoOper.IS);
247	321
248	322	}
249		- if(null!=phone){
250		- condition=condition.and("phone", phone, MongoOper.IS);
	323	+ if (null != phone) {
	324	+ condition = condition.and("phone", phone, MongoOper.IS);
251	325	}
252		- if(null!=name){
253		- condition=condition.and("username", name, MongoOper.IS);
	326	+ if (null != name) {
	327	+ condition = condition.and("username", name, MongoOper.IS);
254	328	}
255		-
256		-
257		- if(-1!=yn){
258		- condition=condition.and("yn", yn, MongoOper.IS);
	329	+ /* //*
	330	+ * 服务类型
	331	+ //
	332	+ private String serviceType;
	333	+ //*
	334	+ * 风险等级
	335	+ //
	336	+ private String rLevel;
	337	+ //*
	338	+ * 高危评分
	339	+ //
	340	+ private String hScore;
	341	+ //*
	342	+ * 高危因素
	343	+ //
	344	+ private String rFactor*/
	345	+ if (null != serviceType) {
	346	+ condition = condition.and("serviceType", serviceType, MongoOper.IS);
259	347	}
260		- if(null!=isNull){
261		- condition=condition.and("communityId", null, MongoOper.IS);
	348	+ if(null!=serviceStatus){
	349	+ condition = condition.and("serviceStatus", serviceStatus, MongoOper.IS);
262	350	}
	351	+ if (null != rLevel) {
	352	+ condition = condition.and("riskLevelId", rLevel, MongoOper.IS);
	353	+ }
	354	+ if (null != hScore) {
	355	+ condition = condition.and("riskScore", hScore, MongoOper.IS);
	356	+ }
	357	+ if (null != hScore) {
	358	+ condition = condition.and("riskFactorId", rFactor, MongoOper.ALL);
	359	+ }
	360	+ if (-1 != yn) {
	361	+ condition = condition.and("yn", yn, MongoOper.IS);
	362	+ }
	363	+ if (null != isNull) {
	364	+ condition = condition.and("communityId", null, MongoOper.IS);
	365	+ }
263	366	//去掉type为3 的情况
264		- /* if(-1!=type){
265		- condition=condition.and("type", type, MongoOper.IS);
266		- }*/
	367	+ /* */
	368	+ if (-1 != type) {
	369	+ condition = condition.and("type", type, MongoOper.IS);
	370	+ }
267	371
268	372	boolean isAddStart = Boolean.FALSE;
269	373	Criteria c = null;
...	...	@@ -274,7 +378,7 @@
274	378
275	379	if (null != dueDateEnd) {
276	380	if (isAddStart) {
277		- c=c.lte(dueDateEnd);
	381	+ c = c.lte(dueDateEnd);
278	382	} else {
279	383	c = Criteria.where("dueDate").lte(dueDateEnd);
280	384	}
281	385
282	386
...	...	@@ -297,14 +401,16 @@
297	401	}
298	402	isAddStart1 = Boolean.TRUE;
299	403	}
300		- if (isAddStart \|\|isAddStart1) {
	404	+ if (isAddStart \|\| isAddStart1) {
301	405	return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
302	406	}
303	407	return condition.toMongoQuery();
304	408	}
	409	+
305	410	public String getId() {
306	411	return id;
307	412	}
	413	+
308	414	public void setId(String id) {
309	415	this.id = id;
310	416	}

1	1	package com.lyms.platform.operate.web.controller;
2	2
3	3	import com.lyms.platform.common.base.BaseController;
	4	+import com.lyms.platform.common.constants.ErrorCodeConstants;
4	5	import com.lyms.platform.common.result.BaseResponse;
5	6	import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
6	7	import com.lyms.platform.operate.web.request.AntExAddRequest;
7	8	import com.lyms.platform.operate.web.request.AntExQueryRequest;
8	9	import com.lyms.platform.operate.web.request.AntExcAddRequest;
9	10	import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest;
	11	+import org.apache.commons.lang.StringUtils;
10	12	import org.springframework.beans.factory.annotation.Autowired;
11	13	import org.springframework.stereotype.Controller;
12	14	import org.springframework.web.bind.annotation.*;
...	...	@@ -33,6 +35,9 @@
33	35	@RequestMapping(method = RequestMethod.GET, value = "/antexmanage")
34	36	@ResponseBody
35	37	public BaseResponse queryAntenatalExamination(@Valid AntenatalExaminationQueryRequest antenatalExaminationQueryRequest) {
	38	+ if(StringUtils.isEmpty(antenatalExaminationQueryRequest.getCardNo())&&StringUtils.isEmpty(antenatalExaminationQueryRequest.getVcCardNo())){
	39	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输出参数.");
	40	+ }
36	41	return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest);
37	42	}
38	43
...	...	@@ -44,7 +49,7 @@
44	49	*/
45	50	@RequestMapping(method = RequestMethod.POST, value = "/antexmanage")
46	51	@ResponseBody
47		- public BaseResponse addOneAntenatalExamination(@Valid AntExAddRequest antExAddRequest) {
	52	+ public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest) {
48	53	return antenatalExaminationFacade.addOneAntEx(antExAddRequest);
49	54	}
50	55	/**
...	...	@@ -55,7 +60,7 @@
55	60	*/
56	61	@RequestMapping(method = RequestMethod.POST, value = "/antex")
57	62	@ResponseBody
58		- public BaseResponse addOneAntEx(@Valid AntExcAddRequest antExcAddRequest){
	63	+ public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest){
59	64	return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest);
60	65	}
61	66

...	...	@@ -10,10 +10,7 @@
10	10	import org.apache.commons.lang.StringUtils;
11	11	import org.springframework.beans.factory.annotation.Autowired;
12	12	import org.springframework.stereotype.Controller;
13		-import org.springframework.web.bind.annotation.RequestMapping;
14		-import org.springframework.web.bind.annotation.RequestMethod;
15		-import org.springframework.web.bind.annotation.RequestParam;
16		-import org.springframework.web.bind.annotation.ResponseBody;
	13	+import org.springframework.web.bind.annotation.*;
17	14
18	15	import javax.validation.Valid;
19	16
20	17
...	...	@@ -44,14 +41,14 @@
44	41	//增加转诊申请单
45	42	@RequestMapping(method = RequestMethod.POST,value = "/referralapply")
46	43	@ResponseBody
47		- public BaseResponse addReferralApplyOrder(@Valid ReferralApplyOrderAddRequest applyOrderAddRequest) {
	44	+ public BaseResponse addReferralApplyOrder(@Valid @RequestBody ReferralApplyOrderAddRequest applyOrderAddRequest) {
48	45	return applyOrderFacade.addOneReferralApplyOrder(applyOrderAddRequest);
49	46	}
50	47
51	48	@RequestMapping(method = RequestMethod.POST,value = "/sieveapply")
52	49	@ResponseBody
53	50	//增加产筛申请单
54		- public BaseResponse addSieveApplyOrder(@Valid SieveApplyOrderAddRequest applyOrderAddRequest) {
	51	+ public BaseResponse addSieveApplyOrder(@Valid @RequestBody SieveApplyOrderAddRequest applyOrderAddRequest) {
55	52	return applyOrderFacade.addOneSieveApplyOrder(applyOrderAddRequest);
56	53	}
57	54	@RequestMapping(method = RequestMethod.GET,value = "/sieveapply")

	1	+package com.lyms.platform.operate.web.controller;
	2	+
	3	+import com.lyms.platform.biz.service.BasicConfigService;
	4	+import com.lyms.platform.common.base.BaseController;
	5	+import com.lyms.platform.common.constants.ErrorCodeConstants;
	6	+import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
	7	+import com.lyms.platform.common.enums.YnEnums;
	8	+import com.lyms.platform.common.result.BaseListResponse;
	9	+import com.lyms.platform.common.result.BaseObjectResponse;
	10	+import com.lyms.platform.common.result.BaseResponse;
	11	+import com.lyms.platform.common.utils.SystemConfig;
	12	+import com.lyms.platform.operate.web.facade.BasicConfigFacade;
	13	+import com.lyms.platform.operate.web.request.BasicConfigQueryRequest;
	14	+import com.lyms.platform.operate.web.result.FrontEndResult;
	15	+import com.lyms.platform.pojo.BasicConfig;
	16	+import com.lyms.platform.query.BasicConfigQuery;
	17	+import org.apache.commons.lang.StringUtils;
	18	+import org.springframework.beans.factory.annotation.Autowired;
	19	+import org.springframework.stereotype.Controller;
	20	+import org.springframework.web.bind.annotation.RequestMapping;
	21	+import org.springframework.web.bind.annotation.RequestMethod;
	22	+import org.springframework.web.bind.annotation.RequestParam;
	23	+import org.springframework.web.bind.annotation.ResponseBody;
	24	+
	25	+import javax.validation.Valid;
	26	+import java.util.ArrayList;
	27	+import java.util.HashMap;
	28	+import java.util.List;
	29	+import java.util.Map;
	30	+
	31	+/**
	32	+ * Created by Administrator on 2016/6/22 0022.
	33	+ */
	34	+@Controller
	35	+public class RiskController extends BaseController {
	36	+
	37	+ @Autowired
	38	+ private BasicConfigService basicConfigService;
	39	+
	40	+ /**
	41	+ * 高危风险版本查询
	42	+ *
	43	+ * @return 返回结果
	44	+ */
	45	+ @RequestMapping(method = RequestMethod.GET, value = "/risk/version")
	46	+ @ResponseBody
	47	+ public FrontEndResult queryRiskVersion(@RequestParam(value = "versionId", required = false) String versionId) {
	48	+ BasicConfigQuery query = new BasicConfigQuery();
	49	+ query.setId(versionId);
	50	+ query.setParentId(SystemConfig.GWFX_NEW);
	51	+ query.setYn(YnEnums.YES.getId());
	52	+ List<BasicConfig> list = basicConfigService.queryBasicConfig(query);
	53	+ List<Map> data = new ArrayList<>();
	54	+ query.setTypeId(SystemConfig.GWFX_NEW_COLOR_TYPE_ID);
	55	+ for (BasicConfig config:list) {
	56	+ Map<String,Object> map = new HashMap<>();
	57	+ map.put("id", config.getId());
	58	+ map.put("name", config.getName());
	59	+ query.setParentId(config.getId());
	60	+ List<BasicConfig> levelList = basicConfigService.queryBasicConfig(query);
	61	+ List<Map> subList = new ArrayList<>();
	62	+ for (BasicConfig b:levelList) {
	63	+ Map<String,Object> submap = new HashMap<>();
	64	+ submap.put("id", b.getId());
	65	+ submap.put("name", b.getName());
	66	+ submap.put("code", b.getCode());
	67	+ subList.add(submap);
	68	+ }
	69	+ map.put("levelList", subList);
	70	+ data.add(map);
	71	+ }
	72	+ return FrontEndResult.ini().setData(data).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	73	+ }
	74	+
	75	+ /**
	76	+ * 高危风险查询
	77	+ *
	78	+ * @return 返回结果
	79	+ */
	80	+ @RequestMapping(method = RequestMethod.GET, value = "/risklist")
	81	+ @ResponseBody
	82	+ public BaseResponse queryRisk(@RequestParam("versionId") String versionId,
	83	+ @RequestParam("page") Integer page,
	84	+ @RequestParam("limit") Integer limit,
	85	+ @RequestParam(value = "typeId", required = false) String typeId,
	86	+ @RequestParam(value = "keyword", required = false) String s) {
	87	+ if (StringUtils.isNotBlank(versionId)) {
	88	+ BasicConfigQuery query = new BasicConfigQuery();
	89	+ query.setParentId(versionId);
	90	+ query.setYn(YnEnums.YES.getId());
	91	+ query.setNeed("y");
	92	+ query.setLimit(limit);
	93	+ query.setPage(page);
	94	+ query.setTypeId(typeId);
	95	+ query.setKeyword(s);
	96	+ List<BasicConfig> list = basicConfigService.queryBasicConfig(query);
	97	+ return FrontEndResult.ini().setData(list).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	98	+ } else {
	99	+ return new BaseResponse("versionId is null", ErrorCodeConstants.PARAMETER_ERROR);
	100	+ }
	101	+ }
	102	+
	103	+ /**
	104	+ * 高危风险查询
	105	+ *
	106	+ * @return 返回结果
	107	+ */
	108	+ @RequestMapping(method = RequestMethod.POST, value = "/riskcopy")
	109	+ @ResponseBody
	110	+ public BaseResponse copyRisk(@RequestParam("versionId") String versionId) {
	111	+ if (StringUtils.isNotBlank(versionId)) {
	112	+ BasicConfig b = basicConfigService.getOneBasicConfigById(versionId);
	113	+ if (b != null) {
	114	+ b.setId(null);
	115	+ b.setName(b.getName() + " - 副本");
	116	+ basicConfigService.addBasicConfig(b);
	117	+ BasicConfigQuery query = new BasicConfigQuery();
	118	+ query.setParentId(versionId);
	119	+ query.setYn(YnEnums.YES.getId());
	120	+ List<BasicConfig> list = basicConfigService.queryBasicConfig(query);
	121	+ List<BasicConfig> configList = new ArrayList<>();
	122	+ Map<String, String> map = new HashMap<>();
	123	+ for (BasicConfig config:list) {
	124	+ String oldId = new String(config.getId());
	125	+ config.setId(null);
	126	+ config.setParentId(b.getId());
	127	+ if (SystemConfig.GWFX_NEW_COLOR_TYPE_ID.equals(b.getTypeId())) {
	128	+ basicConfigService.addBasicConfig(config);
	129	+ map.put(oldId, config.getId());
	130	+ } else {
	131	+ configList.add(config);
	132	+ }
	133	+ }
	134	+ if (configList.size() > 0) {
	135	+ for (BasicConfig config : configList) {
	136	+ config.setTypeId(map.get(config.getTypeId()));
	137	+ }
	138	+ basicConfigService.batchSave(configList);
	139	+ }
	140	+ return new BaseResponse("成功", ErrorCodeConstants.SUCCESS);
	141	+ } else {
	142	+ return new BaseResponse("版本数据不存在", ErrorCodeConstants.BUSINESS_ERROR);
	143	+ }
	144	+
	145	+ } else {
	146	+ return new BaseResponse("versionId is null", ErrorCodeConstants.PARAMETER_ERROR);
	147	+ }
	148	+ }
	149	+
	150	+ @RequestMapping(method = RequestMethod.POST, value = "/risk/version")
	151	+ @ResponseBody
	152	+ public BaseResponse addRiskVersion(@RequestParam("name") String name) {
	153	+ BasicConfig config = new BasicConfig();
	154	+ config.setParentId(SystemConfig.GWFX_NEW);
	155	+ config.setTypeId("0");
	156	+ config.setName(name);
	157	+ config.setYn(YnEnums.YES.getId());
	158	+ config.setCode(name);
	159	+ config.setEnable(YnEnums.YES.getId());
	160	+ config.setCreateDate(System.currentTimeMillis());
	161	+ basicConfigService.addBasicConfig(config);
	162	+ BasicConfig c = new BasicConfig();
	163	+ c.setParentId(config.getId());
	164	+ c.setTypeId(SystemConfig.GWFX_NEW_COLOR_TYPE_ID);
	165	+ c.setYn(YnEnums.YES.getId());
	166	+ c.setEnable(YnEnums.YES.getId());
	167	+ c.setCreateDate(System.currentTimeMillis());
	168	+ for (RiskDefaultTypeEnum e:RiskDefaultTypeEnum.values()) {
	169	+ c.setId(null);
	170	+ c.setName(e.getTitle());
	171	+ c.setCode(e.getColor());
	172	+ basicConfigService.addBasicConfig(c);
	173	+ }
	174	+ return new BaseObjectResponse().setData(config.getId()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	175	+ }
	176	+
	177	+
	178	+}

...	...	@@ -77,7 +77,7 @@
77	77	public BaseResponse addOneAnetExChu(AntExcAddRequest excAddRequest){
78	78	AntExChuModel antExChuModel = excAddRequest.convertToDataModel();
79	79	if(StringUtils.isNotEmpty(antExChuModel.getId()) &&StringUtils.isNotEmpty(antExChuModel.getParentId())){
80		- antenatalExaminationService.updateAntExChu(antExChuModel,antExChuModel.getId());
	80	+ antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId());
81	81	}else{
82	82	antExChuModel.setYn(YnEnums.YES.getId());
83	83	antenatalExaminationService.addOneAntEx(antExChuModel);
...	...	@@ -146,7 +146,9 @@
146	146	public BaseResponse queryAntenatalExamination(AntenatalExaminationQueryRequest queryRequest){
147	147	//查询产妇数据
148	148	Patients patients = findOnePatient(queryRequest.getCardNo(),queryRequest.getVcCardNo());
149		-
	149	+ if(null==patients){
	150	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有产妇信息");
	151	+ }
150	152	AntexListResult antexListResult = new AntexListResult();
151	153	AntExChuQuery antExChuQuery=new AntExChuQuery();
152	154	antExChuQuery.setParentId(patients.getId());
...	...	@@ -184,6 +186,15 @@
184	186	}else{
185	187	//查询初诊数据
186	188	AntexChuResult antexChuResult= new AntexChuResult();
	189	+ AntExChuQuery antExChuQuery=new AntExChuQuery();
	190	+ antExChuQuery.setYn(YnEnums.YES.getId());
	191	+ antExChuQuery.setId(antExQueryRequest.getId());
	192	+ List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
	193	+ AntExChuModel antExChuModel=null;
	194	+ if(CollectionUtils.isNotEmpty(antExChuModels)){
	195	+ antExChuModels.get(0);
	196	+ }
	197	+ antexChuResult.convertToResult(antExChuModel);
187	198	object=antexChuResult;
188	199	}
189	200

...	...	@@ -79,6 +79,9 @@
79	79	obj.setName(basicConfigUpdateRequest.getName());
80	80	obj.setId(basicConfigUpdateRequest.getId());
81	81	obj.setEnable(basicConfigUpdateRequest.getEnable());
	82	+ obj.setTypeId(basicConfigUpdateRequest.getTypeId());
	83	+ obj.setScore(basicConfigUpdateRequest.getScore());
	84	+ obj.setDescribe(basicConfigUpdateRequest.getDescribe());
82	85	BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
83	86	basicConfigQuery.setId(basicConfigUpdateRequest.getId());
84	87	basicConfigQuery.setYn(YnEnums.YES.getId());

...	...	@@ -167,7 +167,270 @@
167	167	//实验结果
168	168	private String syjg;
169	169
	170	+ public String getAbo() {
	171	+ return abo;
	172	+ }
170	173
	174	+ public void setAbo(String abo) {
	175	+ this.abo = abo;
	176	+ }
	177	+
	178	+ public String getAlbumin() {
	179	+ return albumin;
	180	+ }
	181	+
	182	+ public void setAlbumin(String albumin) {
	183	+ this.albumin = albumin;
	184	+ }
	185	+
	186	+ public String getbChao() {
	187	+ return bChao;
	188	+ }
	189	+
	190	+ public void setbChao(String bChao) {
	191	+ this.bChao = bChao;
	192	+ }
	193	+
	194	+ public String getBld() {
	195	+ return bld;
	196	+ }
	197	+
	198	+ public void setBld(String bld) {
	199	+ this.bld = bld;
	200	+ }
	201	+
	202	+ public String getBloodSugar() {
	203	+ return bloodSugar;
	204	+ }
	205	+
	206	+ public void setBloodSugar(String bloodSugar) {
	207	+ this.bloodSugar = bloodSugar;
	208	+ }
	209	+
	210	+ public String getBxbjs() {
	211	+ return bxbjs;
	212	+ }
	213	+
	214	+ public void setBxbjs(String bxbjs) {
	215	+ this.bxbjs = bxbjs;
	216	+ }
	217	+
	218	+ public String getChgOther() {
	219	+ return chgOther;
	220	+ }
	221	+
	222	+ public void setChgOther(String chgOther) {
	223	+ this.chgOther = chgOther;
	224	+ }
	225	+
	226	+ public String getDueDate() {
	227	+ return dueDate;
	228	+ }
	229	+
	230	+ public void setDueDate(String dueDate) {
	231	+ this.dueDate = dueDate;
	232	+ }
	233	+
	234	+ public String getHivkt() {
	235	+ return hivkt;
	236	+ }
	237	+
	238	+ public void setHivkt(String hivkt) {
	239	+ this.hivkt = hivkt;
	240	+ }
	241	+
	242	+ public String getJhBilirubin() {
	243	+ return jhBilirubin;
	244	+ }
	245	+
	246	+ public void setJhBilirubin(String jhBilirubin) {
	247	+ this.jhBilirubin = jhBilirubin;
	248	+ }
	249	+
	250	+ public String getLastMenses() {
	251	+ return lastMenses;
	252	+ }
	253	+
	254	+ public void setLastMenses(String lastMenses) {
	255	+ this.lastMenses = lastMenses;
	256	+ }
	257	+
	258	+ public String getMdxqsy() {
	259	+ return mdxqsy;
	260	+ }
	261	+
	262	+ public void setMdxqsy(String mdxqsy) {
	263	+ this.mdxqsy = mdxqsy;
	264	+ }
	265	+
	266	+ public String getNcgOther() {
	267	+ return ncgOther;
	268	+ }
	269	+
	270	+ public void setNcgOther(String ncgOther) {
	271	+ this.ncgOther = ncgOther;
	272	+ }
	273	+
	274	+ public String getNdb() {
	275	+ return ndb;
	276	+ }
	277	+
	278	+ public void setNdb(String ndb) {
	279	+ this.ndb = ndb;
	280	+ }
	281	+
	282	+ public String getNt() {
	283	+ return nt;
	284	+ }
	285	+
	286	+ public void setNt(String nt) {
	287	+ this.nt = nt;
	288	+ }
	289	+
	290	+ public String getPlatelet() {
	291	+ return platelet;
	292	+ }
	293	+
	294	+ public void setPlatelet(String platelet) {
	295	+ this.platelet = platelet;
	296	+ }
	297	+
	298	+ public String getRh() {
	299	+ return rh;
	300	+ }
	301	+
	302	+ public void setRh(String rh) {
	303	+ this.rh = rh;
	304	+ }
	305	+
	306	+ public String getSyjg() {
	307	+ return syjg;
	308	+ }
	309	+
	310	+ public void setSyjg(String syjg) {
	311	+ this.syjg = syjg;
	312	+ }
	313	+
	314	+ public String getTireNumber() {
	315	+ return tireNumber;
	316	+ }
	317	+
	318	+ public void setTireNumber(String tireNumber) {
	319	+ this.tireNumber = tireNumber;
	320	+ }
	321	+
	322	+ public String getTotalBilirubin() {
	323	+ return totalBilirubin;
	324	+ }
	325	+
	326	+ public void setTotalBilirubin(String totalBilirubin) {
	327	+ this.totalBilirubin = totalBilirubin;
	328	+ }
	329	+
	330	+ public String getUrineKetone() {
	331	+ return urineKetone;
	332	+ }
	333	+
	334	+ public void setUrineKetone(String urineKetone) {
	335	+ this.urineKetone = urineKetone;
	336	+ }
	337	+
	338	+ public String getXhdb() {
	339	+ return xhdb;
	340	+ }
	341	+
	342	+ public void setXhdb(String xhdb) {
	343	+ this.xhdb = xhdb;
	344	+ }
	345	+
	346	+ public String getXnsd() {
	347	+ return xnsd;
	348	+ }
	349	+
	350	+ public void setXnsd(String xnsd) {
	351	+ this.xnsd = xnsd;
	352	+ }
	353	+
	354	+ public String getXqgbzam() {
	355	+ return xqgbzam;
	356	+ }
	357	+
	358	+ public void setXqgbzam(String xqgbzam) {
	359	+ this.xqgbzam = xqgbzam;
	360	+ }
	361	+
	362	+ public String getXqgczam() {
	363	+ return xqgczam;
	364	+ }
	365	+
	366	+ public void setXqgczam(String xqgczam) {
	367	+ this.xqgczam = xqgczam;
	368	+ }
	369	+
	370	+ public String getXqjq() {
	371	+ return xqjq;
	372	+ }
	373	+
	374	+ public void setXqjq(String xqjq) {
	375	+ this.xqjq = xqjq;
	376	+ }
	377	+
	378	+ public Map getYdfmw() {
	379	+ return ydfmw;
	380	+ }
	381	+
	382	+ public void setYdfmw(Map ydfmw) {
	383	+ this.ydfmw = ydfmw;
	384	+ }
	385	+
	386	+ public String getYdqjd() {
	387	+ return ydqjd;
	388	+ }
	389	+
	390	+ public void setYdqjd(String ydqjd) {
	391	+ this.ydqjd = ydqjd;
	392	+ }
	393	+
	394	+ public String getYgbmkt() {
	395	+ return ygbmkt;
	396	+ }
	397	+
	398	+ public void setYgbmkt(String ygbmkt) {
	399	+ this.ygbmkt = ygbmkt;
	400	+ }
	401	+
	402	+ public String getYgbmky() {
	403	+ return ygbmky;
	404	+ }
	405	+
	406	+ public void setYgbmky(String ygbmky) {
	407	+ this.ygbmky = ygbmky;
	408	+ }
	409	+
	410	+ public String getYgekt() {
	411	+ return ygekt;
	412	+ }
	413	+
	414	+ public void setYgekt(String ygekt) {
	415	+ this.ygekt = ygekt;
	416	+ }
	417	+
	418	+ public String getYgeky() {
	419	+ return ygeky;
	420	+ }
	421	+
	422	+ public void setYgeky(String ygeky) {
	423	+ this.ygeky = ygeky;
	424	+ }
	425	+
	426	+ public String getYghxkt() {
	427	+ return yghxkt;
	428	+ }
	429	+
	430	+ public void setYghxkt(String yghxkt) {
	431	+ this.yghxkt = yghxkt;
	432	+ }
	433	+
171	434	public String getParentId() {
172	435	return parentId;
173	436	}
...	...	@@ -487,7 +750,7 @@
487	750	antExChuModel.setFuwei(fuwei);
488	751	antExChuModel.setTireNumber1(tireNumber1);
489	752	antExChuModel.setPlacentas(placentas);
490		- antExChuModel.setHighrisk(JsonUtil.obj2JsonString(highrisk));
	753	+ antExChuModel.setHighrisk(JsonUtil.array2JsonString(highrisk));
491	754	antExChuModel.setHighriskSocre(highriskSocre);
492	755	antExChuModel.setOtherHighRisk(JsonUtil.obj2JsonString(otherHighRisk));
493	756	antExChuModel.setDiagnosis(diagnosis);

...	...	@@ -18,6 +18,34 @@
18	18	@FormParam
19	19	private String code;
20	20
	21	+ private String typeId;
	22	+ private Integer score;
	23	+ private String describe;
	24	+
	25	+ public String getTypeId() {
	26	+ return typeId;
	27	+ }
	28	+
	29	+ public void setTypeId(String typeId) {
	30	+ this.typeId = typeId;
	31	+ }
	32	+
	33	+ public Integer getScore() {
	34	+ return score;
	35	+ }
	36	+
	37	+ public void setScore(Integer score) {
	38	+ this.score = score;
	39	+ }
	40	+
	41	+ public String getDescribe() {
	42	+ return describe;
	43	+ }
	44	+
	45	+ public void setDescribe(String describe) {
	46	+ this.describe = describe;
	47	+ }
	48	+
21	49	public String getParentId() {
22	50	return parentId;
23	51	}
...	...	@@ -54,6 +82,9 @@
54	82	if(StringUtils.isEmpty(parentId)){
55	83	return null;
56	84	}
	85	+ basicConfig.setTypeId(typeId);
	86	+ basicConfig.setDescribe(describe);
	87	+ basicConfig.setScore(score);
57	88	basicConfig.setCode(code);
58	89	basicConfig.setName(name);
59	90	basicConfig.setParentId(parentId);

...	...	@@ -16,6 +16,33 @@
16	16	private String code;
17	17	@FormParam
18	18	private int enable;
	19	+ private String typeId;
	20	+ private Integer score;
	21	+ private String describe;
	22	+
	23	+ public String getTypeId() {
	24	+ return typeId;
	25	+ }
	26	+
	27	+ public void setTypeId(String typeId) {
	28	+ this.typeId = typeId;
	29	+ }
	30	+
	31	+ public Integer getScore() {
	32	+ return score;
	33	+ }
	34	+
	35	+ public void setScore(Integer score) {
	36	+ this.score = score;
	37	+ }
	38	+
	39	+ public String getDescribe() {
	40	+ return describe;
	41	+ }
	42	+
	43	+ public void setDescribe(String describe) {
	44	+ this.describe = describe;
	45	+ }
19	46
20	47	public int getEnable() {
21	48	return enable;

...	...	@@ -3,8 +3,11 @@
3	3	import com.lyms.platform.common.base.IBasicRequestConvert;
4	4	import com.lyms.platform.common.core.annotation.form.FormParam;
5	5	import com.lyms.platform.common.core.annotation.form.Form;
	6	+import com.lyms.platform.common.utils.JsonUtil;
6	7	import com.lyms.platform.pojo.SieveApplyOrderModel;
7	8
	9	+import java.util.List;
	10	+
8	11	/**
9	12	* 产筛申请
10	13	* Created by Administrator on 2016/6/15 0015.
...	...	@@ -14,7 +17,7 @@
14	17	@FormParam
15	18	private String parentId;
16	19	@FormParam
17		- private String check;
	20	+ private List check;
18	21	@FormParam
19	22	private String guide;
20	23	@FormParam
...	...	@@ -27,7 +30,7 @@
27	30	SieveApplyOrderModel sieveApplyOrderModel = new SieveApplyOrderModel();
28	31	sieveApplyOrderModel.setParentId(parentId);
29	32	sieveApplyOrderModel.setApplyDoctor(applyDoctor);
30		- sieveApplyOrderModel.setCheckItem(check);
	33	+ sieveApplyOrderModel.setCheckItem(JsonUtil.array2JsonString(check));
31	34	sieveApplyOrderModel.setCheckDate(checkDate);
32	35	sieveApplyOrderModel.setGuide(guide);
33	36	return sieveApplyOrderModel;
34	37
...	...	@@ -41,11 +44,11 @@
41	44	this.applyDoctor = applyDoctor;
42	45	}
43	46
44		- public String getCheck() {
	47	+ public List getCheck() {
45	48	return check;
46	49	}
47	50
48		- public void setCheck(String check) {
	51	+ public void setCheck(List check) {
49	52	this.check = check;
50	53	}
51	54

...	...	@@ -39,7 +39,7 @@
39	39	FetalPosition 胎方位
40	40	FetalPresentation 胎先露
41	41	join 衔接*/
42		- private String tireData;
	42	+ private List tireData;
43	43	//血红蛋白
44	44	private String hemoglobin;
45	45	//尿蛋白
...	...	@@ -89,7 +89,7 @@
89	89	setId(destModel.getId());
90	90	setOtherRisk(destModel.getOtherRisk());
91	91	setTireNumber(destModel.getTireNumber());
92		- setTireData(JsonUtil.obj2JsonString(destModel.getTireData()));
	92	+ setTireData(destModel.getTireData());
93	93	setType(destModel.getType());
94	94	return this;
95	95	}
96	96
...	...	@@ -246,11 +246,11 @@
246	246	this.riskScore = riskScore;
247	247	}
248	248
249		- public String getTireData() {
	249	+ public List getTireData() {
250	250	return tireData;
251	251	}
252	252
253		- public void setTireData(String tireData) {
	253	+ public void setTireData(List tireData) {
254	254	this.tireData = tireData;
255	255	}
256	256

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import com.lyms.platform.common.base.IBasicResultConvert;
	4	+import com.lyms.platform.common.utils.DateUtil;
3	5	import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
	6	+import com.lyms.platform.pojo.AntExChuModel;
	7	+import com.lyms.platform.pojo.AntenatalExaminationModel;
	8	+import com.lyms.platform.pojo.Patients;
	9	+import org.apache.commons.collections.CollectionUtils;
4	10
	11	+import java.util.ArrayList;
5	12	import java.util.Date;
6	13	import java.util.List;
7	14
8	15
...	...	@@ -10,12 +17,12 @@
10	17	* 产前检查初诊 *
11	18	* Created by Administrator on 2016/6/20 0020.
12	19	*/
13		-public class AntexChuResult {
	20	+public class AntexChuResult {
14	21
15	22	private String parentId;
16	23	/基本信息/
17	24	private String id;
18		- //名字
	25	+ /* //名字
19	26	private String name;
20	27	//年龄
21	28	private Integer age;
...	...	@@ -30,7 +37,7 @@
30	37	//高危评分
31	38	private String riskScore;
32	39	//备注
33		- private String remarks;
	40	+ private String remarks;*/
34	41	//末次月经
35	42	private String lastMenses;
36	43
37	44
...	...	@@ -193,13 +200,7 @@
193	200	this.abortion = abortion;
194	201	}
195	202
196		- public Integer getAge() {
197		- return age;
198		- }
199	203
200		- public void setAge(Integer age) {
201		- this.age = age;
202		- }
203	204
204	205	public String getAlbumin() {
205	206	return albumin;
206	207
...	...	@@ -305,14 +306,7 @@
305	306	this.dirOpinion = dirOpinion;
306	307	}
307	308
308		- public String getDueWeek() {
309		- return dueWeek;
310		- }
311	309
312		- public void setDueWeek(String dueWeek) {
313		- this.dueWeek = dueWeek;
314		- }
315		-
316	310	public String getFamilyHistory() {
317	311	return familyHistory;
318	312	}
319	313
...	...	@@ -409,13 +403,7 @@
409	403	this.mdxqsy = mdxqsy;
410	404	}
411	405
412		- public String getName() {
413		- return name;
414		- }
415	406
416		- public void setName(String name) {
417		- this.name = name;
418		- }
419	407
420	408	public String getNcgOther() {
421	409	return ncgOther;
422	410
...	...	@@ -481,13 +469,7 @@
481	469	this.personalHistory = personalHistory;
482	470	}
483	471
484		- public String getPhone() {
485		- return phone;
486		- }
487	472
488		- public void setPhone(String phone) {
489		- this.phone = phone;
490		- }
491	473
492	474	public List<MatDeliverAddRequest.Placenta> getPlacentas() {
493	475	return placentas;
494	476
495	477
...	...	@@ -537,38 +519,8 @@
537	519	this.prodTime = prodTime;
538	520	}
539	521
540		- public String getRemarks() {
541		- return remarks;
542		- }
543	522
544		- public void setRemarks(String remarks) {
545		- this.remarks = remarks;
546		- }
547	523
548		- public String getRh() {
549		- return rh;
550		- }
551		-
552		- public void setRh(String rh) {
553		- this.rh = rh;
554		- }
555		-
556		- public String getRiskFactor() {
557		- return riskFactor;
558		- }
559		-
560		- public void setRiskFactor(String riskFactor) {
561		- this.riskFactor = riskFactor;
562		- }
563		-
564		- public String getRiskScore() {
565		- return riskScore;
566		- }
567		-
568		- public void setRiskScore(String riskScore) {
569		- this.riskScore = riskScore;
570		- }
571		-
572	524	public String getStillbirth() {
573	525	return stillbirth;
574	526	}
575	527
...	...	@@ -673,13 +625,7 @@
673	625	this.xqjq = xqjq;
674	626	}
675	627
676		- public String getyChanQi() {
677		- return yChanQi;
678		- }
679	628
680		- public void setyChanQi(String yChanQi) {
681		- this.yChanQi = yChanQi;
682		- }
683	629
684	630	public String getYdfmw() {
685	631	return ydfmw;
...	...	@@ -775,6 +721,15 @@
775	721
776	722	public void setParentId(String parentId) {
777	723	this.parentId = parentId;
	724	+ }
	725	+
	726	+ public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
	727	+ setId(antExChuModel.getId());
	728	+ setParentId(antExChuModel.getParentId());
	729	+ setAbo(antExChuModel.getAbortion());
	730	+ setAlbumin(antExChuModel.getAbortion());
	731	+ setBaricIndex(antExChuModel.getBaricIndex());
	732	+ return this;
778	733	}
779	734	}

...	...	@@ -30,11 +30,13 @@
30	30	//手机号
31	31	private String phone;
32	32	//高危因素
33		- private String riskFactor;
	33	+ private List riskFactor;
34	34	//高危评分
35	35	private String riskScore;
36	36	//备注
37	37	private String remarks;
	38	+ //末次月经
	39	+ private String lastMenses;
38	40	//<!---------基本信息----------->
39	41
40	42	private List data = new ArrayList();
41	43
...	...	@@ -87,13 +89,7 @@
87	89	this.remarks = remarks;
88	90	}
89	91
90		- public String getRiskFactor() {
91		- return riskFactor;
92		- }
93	92
94		- public void setRiskFactor(String riskFactor) {
95		- this.riskFactor = riskFactor;
96		- }
97	93
98	94	public String getRiskScore() {
99	95	return riskScore;
100	96
101	97
102	98
103	99
...	...	@@ -123,18 +119,22 @@
123	119	setPhone(patients.getPhone());
124	120	setRemarks("产妇备注");
125	121	setRiskScore("60");
126		- setRiskFactor("高危因素");
	122	+ /* List<Map> list=new ArrayList<>();
	123	+ setRiskFactor();*/
127	124	setDueWeek("");
	125	+ if(null!=patients.getLastMenses()){
	126	+ setLastMenses(DateUtil.getYmd(patients.getLastMenses()));
	127	+ }
	128	+ List<AntData> dataList = new ArrayList<>();
	129	+ if(null!=antExChuModel){
	130	+ dataList.add(new AntData(antExChuModel));
	131	+ }
128	132	if(CollectionUtils.isNotEmpty(destModel)){
129		- List<AntData> dataList = new ArrayList<>();
130		- if(null!=antExChuModel){
131		- dataList.add(new AntData(antExChuModel));
132		- }
133	133	for(AntenatalExaminationModel model:destModel){
134	134	dataList.add(new AntData(model));
135	135	}
136		- setData(dataList);
137	136	}
	137	+ setData(dataList);
138	138	return this;
139	139	}
140	140	private class AntData{
...	...	@@ -182,6 +182,14 @@
182	182
183	183	public void setData(List data) {
184	184	this.data = data;
	185	+ }
	186	+
	187	+ public String getLastMenses() {
	188	+ return lastMenses;
	189	+ }
	190	+
	191	+ public void setLastMenses(String lastMenses) {
	192	+ this.lastMenses = lastMenses;
185	193	}
186	194	}