shiyang / regional-platform

Commit e2ffe45ec31fce3840f775a191a0228839e08143

Authored by jiangjiazhi over 8 years ago

Merge remote-tracking branch 'origin/master'

Showing 13 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BabyCheckService.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResponse.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/CheckResult.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckInfo.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/LisCheckResult.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/RisCheckInfo.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/v1/HisService.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/v2/HisService.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/BabyCheckController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
pom.xml

...	...	@@ -69,6 +69,15 @@
69	69	return babyAwDao.queryAwByHeight(condition.toMongoQuery());
70	70	}
71	71
	72	+ public List<AwModel> queryBabyHealthConfig(Integer agetType, Integer sex,Integer type,Double height) {
	73	+ MongoCondition condition = MongoCondition.newInstance();
	74	+ condition = condition.and("agetType", agetType, MongoOper.IS);
	75	+ condition = condition.and("sex", sex, MongoOper.IS);
	76	+ condition = condition.and("type", type, MongoOper.IS);
	77	+ condition = condition.and("height", height, MongoOper.IS);
	78	+ return babyAwDao.queryAwByHeight(condition.toMongoQuery());
	79	+ }
	80	+
72	81	public List<BabyCheckModel> queryLastCheck(List<String> ids) {
73	82	return babyCheckDao.queryLastCheck(ids);
74	83	}

...	...	@@ -16,7 +16,7 @@
16	16	private String applyDept;
17	17	private String doctor;
18	18	private String checkDept;
19		- private String imgs;
	19	+ private List<String> imgs;
20	20	private String result;
21	21	private String notice;
22	22	/* 1:检验报告，2：影像报告 */
23	23
...	...	@@ -114,11 +114,11 @@
114	114	this.checkDept = checkDept;
115	115	}
116	116
117		- public String getImgs() {
	117	+ public List<String> getImgs() {
118	118	return imgs;
119	119	}
120	120
121		- public void setImgs(String imgs) {
	121	+ public void setImgs(List<String> imgs) {
122	122	this.imgs = imgs;
123	123	}
124	124

	1	+package com.lyms.hospitalapi.pojo;
	2	+
	3	+import java.util.List;
	4	+
	5	+/**
	6	+ * Created by Administrator on 2016/9/9 0009.
	7	+ */
	8	+public class CheckResult {
	9	+
	10	+ private String ymd;
	11	+ private List<CheckResponse> jianyan;
	12	+ private List<CheckResponse> yingxiang;
	13	+
	14	+ public String getYmd() {
	15	+ return ymd;
	16	+ }
	17	+
	18	+ public void setYmd(String ymd) {
	19	+ this.ymd = ymd;
	20	+ }
	21	+
	22	+ public List<CheckResponse> getJianyan() {
	23	+ return jianyan;
	24	+ }
	25	+
	26	+ public void setJianyan(List<CheckResponse> jianyan) {
	27	+ this.jianyan = jianyan;
	28	+ }
	29	+
	30	+ public List<CheckResponse> getYingxiang() {
	31	+ return yingxiang;
	32	+ }
	33	+
	34	+ public void setYingxiang(List<CheckResponse> yingxiang) {
	35	+ this.yingxiang = yingxiang;
	36	+ }
	37	+}

1	1	package com.lyms.hospitalapi.pojo;
2	2
3		-import java.util.Date;
4	3
5	4	/**
6	5	* Created by Administrator on 2016/9/9 0009.
...	...	@@ -37,12 +36,12 @@
37	36	private String P_ADMISSIONNUM;
38	37	private String P_REPORTTYPENAME;
39	38	private String P_APPLATIONDOCNAME;
40		- private Date P_REPORTISSUETIME;
41		- private Date P_APPLATIONTIME;
42		- private Date P_REPORTTIME;
43		- private Date P_CHECKTIME;
44		- private Date MODIFIED;
45		- private Integer STATUS;
	39	+ private String P_REPORTISSUETIME;
	40	+ private String P_APPLATIONTIME;
	41	+ private String P_REPORTTIME;
	42	+ private String P_CHECKTIME;
	43	+ private String MODIFIED;
	44	+ private String STATUS;
46	45
47	46	public String getP_TITLE() {
48	47	return P_TITLE;
49	48
50	49
51	50
52	51
53	52
54	53
55	54
56	55
57	56
58	57
59	58
...	...	@@ -140,51 +139,51 @@
140	139	P_APPLATIONDOCNAME = p_APPLATIONDOCNAME;
141	140	}
142	141
143		- public Date getP_REPORTISSUETIME() {
	142	+ public String getP_REPORTISSUETIME() {
144	143	return P_REPORTISSUETIME;
145	144	}
146	145
147		- public void setP_REPORTISSUETIME(Date p_REPORTISSUETIME) {
	146	+ public void setP_REPORTISSUETIME(String p_REPORTISSUETIME) {
148	147	P_REPORTISSUETIME = p_REPORTISSUETIME;
149	148	}
150	149
151		- public Date getP_APPLATIONTIME() {
	150	+ public String getP_APPLATIONTIME() {
152	151	return P_APPLATIONTIME;
153	152	}
154	153
155		- public void setP_APPLATIONTIME(Date p_APPLATIONTIME) {
	154	+ public void setP_APPLATIONTIME(String p_APPLATIONTIME) {
156	155	P_APPLATIONTIME = p_APPLATIONTIME;
157	156	}
158	157
159		- public Date getP_REPORTTIME() {
	158	+ public String getP_REPORTTIME() {
160	159	return P_REPORTTIME;
161	160	}
162	161
163		- public void setP_REPORTTIME(Date p_REPORTTIME) {
	162	+ public void setP_REPORTTIME(String p_REPORTTIME) {
164	163	P_REPORTTIME = p_REPORTTIME;
165	164	}
166	165
167		- public Date getP_CHECKTIME() {
	166	+ public String getP_CHECKTIME() {
168	167	return P_CHECKTIME;
169	168	}
170	169
171		- public void setP_CHECKTIME(Date p_CHECKTIME) {
	170	+ public void setP_CHECKTIME(String p_CHECKTIME) {
172	171	P_CHECKTIME = p_CHECKTIME;
173	172	}
174	173
175		- public Date getMODIFIED() {
	174	+ public String getMODIFIED() {
176	175	return MODIFIED;
177	176	}
178	177
179		- public void setMODIFIED(Date MODIFIED) {
	178	+ public void setMODIFIED(String MODIFIED) {
180	179	this.MODIFIED = MODIFIED;
181	180	}
182	181
183		- public Integer getSTATUS() {
	182	+ public String getSTATUS() {
184	183	return STATUS;
185	184	}
186	185
187		- public void setSTATUS(Integer STATUS) {
	186	+ public void setSTATUS(String STATUS) {
188	187	this.STATUS = STATUS;
189	188	}
190	189	}

1	1	package com.lyms.hospitalapi.pojo;
2	2
3		-import java.util.Date;
4		-
5	3	/**
6	4	* Created by Administrator on 2016/9/9 0009.
7	5	* 字段名称字段类型字段描述
...	...	@@ -31,9 +29,9 @@
31	29	private String P_ITEMRESULT;
32	30	private String P_UNIT;
33	31	private String P_CODERESULT;
34		- private Date P_REPORTTIME;
35		- private Integer P_PRINTORDER;
36		- private Integer P_PRINTGROUP;
	32	+ private String P_REPORTTIME;
	33	+ private String P_PRINTORDER;
	34	+ private String P_PRINTGROUP;
37	35
38	36	public String getP_APPLICATIONNUM() {
39	37	return P_APPLICATIONNUM;
40	38
41	39
42	40
43	41
44	42
...	...	@@ -115,27 +113,27 @@
115	113	P_CODERESULT = p_CODERESULT;
116	114	}
117	115
118		- public Date getP_REPORTTIME() {
	116	+ public String getP_REPORTTIME() {
119	117	return P_REPORTTIME;
120	118	}
121	119
122		- public void setP_REPORTTIME(Date p_REPORTTIME) {
	120	+ public void setP_REPORTTIME(String p_REPORTTIME) {
123	121	P_REPORTTIME = p_REPORTTIME;
124	122	}
125	123
126		- public Integer getP_PRINTORDER() {
	124	+ public String getP_PRINTORDER() {
127	125	return P_PRINTORDER;
128	126	}
129	127
130		- public void setP_PRINTORDER(Integer p_PRINTORDER) {
	128	+ public void setP_PRINTORDER(String p_PRINTORDER) {
131	129	P_PRINTORDER = p_PRINTORDER;
132	130	}
133	131
134		- public Integer getP_PRINTGROUP() {
	132	+ public String getP_PRINTGROUP() {
135	133	return P_PRINTGROUP;
136	134	}
137	135
138		- public void setP_PRINTGROUP(Integer p_PRINTGROUP) {
	136	+ public void setP_PRINTGROUP(String p_PRINTGROUP) {
139	137	P_PRINTGROUP = p_PRINTGROUP;
140	138	}
141	139	}

1	1	package com.lyms.hospitalapi.pojo;
2	2
3		-import java.util.Date;
4	3
5	4	/**
6	5	* Created by Administrator on 2016/9/9 0009.
...	...	@@ -18,7 +17,7 @@
18	17	APPLY_DOCTOR VARCHAR2 申请医生
19	18	EXECUTE_DEPT VARCHAR2 执行科室名称
20	19	EXECUTE_MAN VARCHAR2 执行人
21		- APPLY_TIME Date 申请时间(检查时间)
	20	+ APPLY_TIME String 申请时间(检查时间)
22	21	STATUS NUMBER 1:申请中,2:检查中,3:诊断完成
23	22	MODIFIED DATE 最后修改时间
24	23	ITEM_RESULT,ITEM_FINDING,IMGS,P_TITLE
...	...	@@ -38,10 +37,10 @@
38	37	private String APPLY_DOCTOR;
39	38	private String EXECUTE_DEPT;
40	39	private String EXECUTE_MAN;
41		- private Integer AGE;
42		- private Integer STATUS;
43		- private Date APPLY_TIME;
44		- private Date MODIFIED;
	40	+ private String AGE;
	41	+ private String STATUS;
	42	+ private String APPLY_TIME;
	43	+ private String MODIFIED;
45	44	private String ITEM_RESULT;
46	45	private String ITEM_FINDING;
47	46	private String IMGS;
48	47
49	48
50	49
51	50
52	51
53	52
54	53
...	...	@@ -151,35 +150,35 @@
151	150	this.EXECUTE_MAN = EXECUTE_MAN;
152	151	}
153	152
154		- public Integer getAGE() {
	153	+ public String getAGE() {
155	154	return AGE;
156	155	}
157	156
158		- public void setAGE(Integer AGE) {
	157	+ public void setAGE(String AGE) {
159	158	this.AGE = AGE;
160	159	}
161	160
162		- public Integer getSTATUS() {
	161	+ public String getSTATUS() {
163	162	return STATUS;
164	163	}
165	164
166		- public void setSTATUS(Integer STATUS) {
	165	+ public void setSTATUS(String STATUS) {
167	166	this.STATUS = STATUS;
168	167	}
169	168
170		- public Date getAPPLY_TIME() {
	169	+ public String getAPPLY_TIME() {
171	170	return APPLY_TIME;
172	171	}
173	172
174		- public void setAPPLY_TIME(Date APPLY_TIME) {
	173	+ public void setAPPLY_TIME(String APPLY_TIME) {
175	174	this.APPLY_TIME = APPLY_TIME;
176	175	}
177	176
178		- public Date getMODIFIED() {
	177	+ public String getMODIFIED() {
179	178	return MODIFIED;
180	179	}
181	180
182		- public void setMODIFIED(Date MODIFIED) {
	181	+ public void setMODIFIED(String MODIFIED) {
183	182	this.MODIFIED = MODIFIED;
184	183	}
185	184

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.hospitalapi.pojo.*;
4	4	import com.lyms.hospitalapi.v2.*;
5	5	import com.lyms.platform.common.utils.DateUtil;
	6	+import com.lyms.platform.common.utils.JsonUtil;
6	7	import org.apache.commons.dbutils.DbUtils;
7	8	import org.apache.commons.dbutils.QueryRunner;
8	9	import org.apache.commons.dbutils.handlers.BeanListHandler;
9	10
10	11
...	...	@@ -19,15 +20,17 @@
19	20	@Service("hisServiceV1")
20	21	public class HisService {
21	22
22		- public List<CheckResponse> queryCheckList(String cardNo) {
	23	+ public List<CheckResult> queryCheckList(String cardNo) {
	24	+ Map<String, Map<String, List<CheckResponse>>> map = new HashMap<>();
23	25	List<CheckResponse> result = new ArrayList<>();
24	26	result.addAll(queryLisCheckList(cardNo));
25	27	result.addAll(queryPacsCheckList(cardNo));
	28	+ List<String> keyList = new ArrayList<>();
26	29	// 去重
27	30	List<CheckResponse> list = new ArrayList<>();
28	31	Date tempDate = null;
29	32	for (CheckResponse check:result) {
30		- if (check.getModified().equals(tempDate)) {
	33	+ if (check.getModified() != null && check.getModified().equals(tempDate)) {
31	34	continue;
32	35	}
33	36	list.add(check);
34	37
35	38
...	...	@@ -37,13 +40,57 @@
37	40	// 排序
38	41	Collections.sort(list, new Comparator() {
39	42	public int compare(Object a, Object b) {
	43	+ if (((CheckResponse)a).getModified() == null) {
	44	+ return -1;
	45	+ }
	46	+ if (((CheckResponse)b).getModified() == null) {
	47	+ return -1;
	48	+ }
40	49	if (((CheckResponse)a).getModified().before(((CheckResponse)a).getModified())) {
41	50	return 1;
42	51	}
43		- return 0;
	52	+ return -1;
44	53	}
45	54	});
46		- return list;
	55	+ for (CheckResponse check:list) {
	56	+ String ymd = DateUtil.getyyyy_MM_dd(check.getModified());
	57	+ if (!keyList.contains(ymd)) {
	58	+ keyList.add(ymd);
	59	+ }
	60	+ Map<String, List<CheckResponse>> dayMap = map.get(ymd);
	61	+ if (dayMap == null) {
	62	+ dayMap = new HashMap<>();
	63	+ map.put(ymd, dayMap);
	64	+ }
	65	+ if (check.getType() == 1) {
	66	+ List<CheckResponse> sub = dayMap.get("jianyan");
	67	+ if (sub == null) {
	68	+ sub = new ArrayList<>();
	69	+ dayMap.put("jianyan", sub);
	70	+ }
	71	+ sub.add(check);
	72	+ } else if (check.getType() == 2) {
	73	+ List<CheckResponse> sub = dayMap.get("yingxiang");
	74	+ if (sub == null) {
	75	+ sub = new ArrayList<>();
	76	+ dayMap.put("yingxiang", sub);
	77	+ }
	78	+ sub.add(check);
	79	+ }
	80	+ }
	81	+ List<CheckResult> resultList = new ArrayList<>();
	82	+ for (String key:keyList) {
	83	+ Map<String, List<CheckResponse>> dayMap = map.get(key);
	84	+ if (dayMap != null) {
	85	+ CheckResult checkResult = new CheckResult();
	86	+ checkResult.setJianyan(dayMap.get("jianyan"));
	87	+ checkResult.setYingxiang(dayMap.get("yingxiang"));
	88	+ checkResult.setYmd(key);
	89	+ resultList.add(checkResult);
	90	+ }
	91	+ }
	92	+
	93	+ return resultList;
47	94	}
48	95
49	96	public List<CheckResponse> queryLisCheckList(String cardNo) {
50	97
51	98
...	...	@@ -59,18 +106,18 @@
59	106	List<LisCheckResult> resultList = queryRunner.query(conn, "select * from lis_check_result where P_APPLICATIONNUM = '"+info.getP_APPLICATIONNUM()+"'", new BeanListHandler<LisCheckResult>(LisCheckResult.class));
60	107	if (resultList != null && resultList.size() > 0) {
61	108	CheckResponse check = new CheckResponse();
62		- check.setModified(info.getMODIFIED());
	109	+ check.setModified(DateUtil.parseYMDHMS(info.getMODIFIED()));
63	110	check.setType(1);
64	111	check.setName(info.getP_NAME());
65	112	check.setTitle(info.getP_TITLE());
66	113	check.setAge(info.getP_AGE());
67		- check.setApplyDate(info.getP_CHECKTIME());
68		- check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(info.getP_CHECKTIME()));
	114	+ check.setApplyDate(DateUtil.parseYMDHMS(info.getP_CHECKTIME()));
	115	+ check.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS(info.getP_CHECKTIME())));
69	116	check.setCheckDept(info.getP_CHECKDEPARTNAME());
70	117	check.setDoctor(info.getP_APPLATIONDOCNAME());
71	118	if ("1".equals(info.getP_SEX())) {
72	119	check.setSex("男");
73		- } else if ("0".equals(info.getP_SEX())) {
	120	+ } else if ("2".equals(info.getP_SEX())) {
74	121	check.setSex("女");
75	122	}
76	123	List<CheckItemResponse> itemList = new ArrayList<>();
77	124
...	...	@@ -112,14 +159,14 @@
112	159	for (RisCheckInfo info:list) {
113	160	if (StringUtils.isNotBlank(info.getITEM_RESULT())) {
114	161	CheckResponse check = new CheckResponse();
115		- check.setModified(info.getMODIFIED());
	162	+ check.setModified(DateUtil.parseYMDHMS(info.getMODIFIED()));
116	163	check.setType(2);
117	164	check.setName(info.getNAME());
118	165	if (info.getAGE() != null) {
119	166	check.setAge(info.getAGE().toString());
120	167	}
121		- check.setApplyDate(info.getAPPLY_TIME());
122		- check.setApplyDateStr(DateUtil.getyyyy_MM_dd_hms(info.getAPPLY_TIME()));
	168	+ check.setApplyDate(DateUtil.parseYMDHMS(info.getAPPLY_TIME()));
	169	+ check.setApplyDateStr(DateUtil.getyyyy_MM_dd(DateUtil.parseYMDHMS(info.getAPPLY_TIME())));
123	170	check.setCheckDept(info.getAPPLY_DEPT());
124	171	check.setDoctor(info.getEXECUTE_MAN());
125	172	if ("F".equals(info.getSEX())) {
...	...	@@ -130,7 +177,7 @@
130	177	check.setResult(info.getITEM_RESULT());
131	178	check.setNotice(info.getITEM_FINDING());
132	179	check.setTitle(info.getP_TITLE());
133		- check.setImgs(info.getIMGS());
	180	+// check.setImgs(info.getIMGS());
134	181	result.add(check);
135	182	}
136	183	}

...	...	@@ -34,6 +34,7 @@
34	34	map.put("sex", info.getSEX());
35	35	map.put("name", info.getNAME());
36	36	map.put("cardNo", info.getIC_CARD_ID());
	37	+ map.put("phone", info.getASSOCIATION_PHONE());
37	38	map.put("birth", DateUtil.getyyyy_MM_dd(info.getBIRTHDATE()));
38	39	}
39	40	DbUtils.closeQuietly(conn);

...	...	@@ -40,7 +40,7 @@
40	40	*/
41	41	@RequestMapping(method = RequestMethod.GET, value = "/hischecklist")
42	42	@ResponseBody
43		- @TokenRequired
	43	+// @TokenRequired
44	44	public BaseResponse queryHisCheckList(String cardNo, HttpServletRequest request) {
45	45	return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV1.queryCheckList(cardNo));
46	46	}

...	...	@@ -122,8 +122,10 @@
122	122	@ResponseBody
123	123	public BaseObjectResponse queryHWByHeight(
124	124	@RequestParam(required = true) Double height,
125		- @RequestParam(required = true) Integer sex){
126		- return babyCheckFacade.queryHWByHeight(height, sex);
	125	+ @RequestParam(required = true) Double weight,
	126	+ @RequestParam(required = true) Integer sex,
	127	+ @RequestParam(required = true) String birth){
	128	+ return babyCheckFacade.queryHWByHeight(height,weight, sex,birth);
127	129
128	130	}
129	131

...	...	@@ -371,14 +371,14 @@
371	371	@RequestMapping(value = "/userRoles", method = RequestMethod.GET)
372	372	@ResponseBody
373	373	@TokenRequired
374		- public FrontEndResult getUserList(HttpServletResponse response,
	374	+ public FrontEndResult getUserList(HttpServletResponse response, HttpServletRequest request,
375	375	@RequestParam(value = "keyword", required = false) String keyword,
376	376	@RequestParam(value = "page", required = false) Integer page,
377	377	@RequestParam(value = "limit", required = false) Integer limit,
378	378	@RequestParam(value = "orgIds", required = false) String orgIds,
379	379	@RequestParam(value = "enable", required = false) Integer enable) {
380	380
381		- limit = limit == null ? 10 : limit;
	381	+ limit = 200;
382	382	page = page == null ? 1 : page;
383	383
384	384	RolesQuery rolesQuery = new RolesQuery();
385	385
386	386
387	387
...	...	@@ -399,11 +399,30 @@
399	399	}
400	400	rolesQuery.setOrgIds(list);
401	401	List<Roles> roles = rolesService.queryRoles(rolesQuery);
	402	+ List<Roles> rolesList = new ArrayList<>();
402	403	if (CollectionUtils.isNotEmpty(roles)) {
	404	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	405	+ Users users = usersService.getUsers(loginState.getId());
	406	+ if (users.getType() == 2) {
	407	+ rolesList.addAll(roles);
	408	+ } else {
	409	+ UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery();
	410	+ userRoleMapsQuery.setYn(YnEnums.YES.getId());
	411	+ userRoleMapsQuery.setUserId(users.getId());
	412	+ List<UserRoleMaps> userRoleMapsList = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery);
	413	+ List<Integer> onwerRoleIds = new ArrayList<>();
	414	+ for (UserRoleMaps maps:userRoleMapsList) {
	415	+ onwerRoleIds.add(maps.getRoleId());
	416	+ }
	417	+ for (Roles roles1 : roles) {
	418	+ if (onwerRoleIds.contains(roles1.getId())) {
	419	+ rolesList.add(roles1);
	420	+ }
	421	+ }
	422	+ }
403	423
404		-
405	424	List<Permissions> permissionses;
406		- for (Roles roles1 : roles) {
	425	+ for (Roles roles1 : rolesList) {
407	426	permissionses = permissionsService.queryPermissionByRoleIds1(roles1.getId());
408	427
409	428	/* RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery();
...	...	@@ -432,7 +451,7 @@
432	451
433	452	FrontEndResult frontEndResult = new FrontEndResult();
434	453	frontEndResult.setPageInfo(rolesQuery.getPageInfo());
435		- frontEndResult.setData(roles);
	454	+ frontEndResult.setData(rolesList);
436	455	frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
437	456
438	457	return frontEndResult;

...	...	@@ -854,18 +854,57 @@
854	854	* @param sex
855	855	* @return
856	856	*/
857		- public BaseObjectResponse queryHWByHeight(Double height, Integer sex) {
	857	+ public BaseObjectResponse queryHWByHeight(Double height,Double value, Integer sex,String birth) {
858	858
859	859	Double hw = getHw(height);
860		- String value = "";
861		- List<HwModel> hws = babyCheckService.queryHWByHeight(hw,sex);
862		- if(CollectionUtils.isNotEmpty(hws))
	860	+
	861	+ //计算儿童的月龄
	862	+ int monthAge = DateUtil.getBabyAgeMonth(DateUtil.parseYMD(birth), new Date());
	863	+ int ageType = 0;
	864	+ if (monthAge > 24)
863	865	{
864		- value = String.valueOf(hws.get(0).getMiddleSd());
	866	+ ageType = 1;
865	867	}
866	868
	869	+ //查询该月龄的年龄别体重值
	870	+ List<AwModel> list = babyCheckService.queryBabyHealthConfig(ageType,sex,3,hw);
	871	+
	872	+ String res = "";
	873	+ if (CollectionUtils.isNotEmpty(list)) {
	874	+ AwModel model = list.get(0);
	875	+
	876	+ if (model.getPthreeDs() < value)
	877	+ {
	878	+ res = "上";
	879	+ }
	880	+ else if (model.getPthreeDs() >=value && value > model.getPtwoDs())
	881	+ {
	882	+ res = "中上";
	883	+ }
	884	+ else if (model.getPtwoDs() >=value && value > model.getPoneDs())
	885	+ {
	886	+ res = "中+";
	887	+ }
	888	+ else if (model.getPoneDs() >=value && value >= model.getRoneDs())
	889	+ {
	890	+ res = "中";
	891	+ }
	892	+ else if (model.getRoneDs() >value && value >= model.getRtwoDs())
	893	+ {
	894	+ res = "中-";
	895	+ }
	896	+ else if (model.getRtwoDs() >value && value >= model.getRthreeDs())
	897	+ {
	898	+ res = "中下";
	899	+ }
	900	+ else if (model.getRtwoDs() >value)
	901	+ {
	902	+ res = "下";
	903	+ }
	904	+ }
	905	+
867	906	BaseObjectResponse br = new BaseObjectResponse();
868		- br.setData(value);
	907	+ br.setData(res);
869	908	br.setErrorcode(ErrorCodeConstants.SUCCESS);
870	909	br.setErrormsg("成功");
871	910	return br;
872	911
873	912
874	913
875	914
876	915
877	916
878	917
879	918
880	919
881	920
882	921
883	922
884	923
885	924
886	925
887	926
888	927
889	928
890	929
...	...	@@ -919,75 +958,73 @@
919	958	public BaseObjectResponse queryGrowthEvaluate(Double height, Integer sex, String birth,Double weight) {
920	959
921	960	List<String> growthEvaluate = new ArrayList<>();
922		-
923		-
924	961	Double hw = getHw(height);
925		- Double value = null;
926		- HwModel hmodel = null;
927	962
928		- //身长别体重
929		- List<HwModel> hws = babyCheckService.queryHWByHeight(hw, sex);
930		- if(CollectionUtils.isNotEmpty(hws))
	963	+ //计算儿童的月龄
	964	+ int monthAge = DateUtil.getBabyAgeMonth(DateUtil.parseYMD(birth), new Date());
	965	+ int ageType = 0;
	966	+ if (monthAge > 24)
931	967	{
932		- hmodel = hws.get(0);
933		- value = hmodel.getMiddleSd();
	968	+ ageType = 1;
934	969	}
935	970
936		-
937		- //计算儿童的月龄
938		- int monthAge = DateUtil.getBabyAgeMonth(DateUtil.parseYMD(birth), new Date());
939		-
940		-
941	971	//查询该月龄的年龄别体重值
942		- List<AwModel> aws = babyCheckService.queryBabyHealthConfig(monthAge, sex,0);
943		- if (CollectionUtils.isNotEmpty(aws) && aws.size() > 1)
	972	+ List<AwModel> list = babyCheckService.queryBabyHealthConfig(ageType, sex, 3, hw);
	973	+
	974	+ if(CollectionUtils.isNotEmpty(list))
944	975	{
945		- AwModel model = aws.get(0);
946		- AwModel model1 = aws.get(1);
	976	+ Double value = list.get(0).getMiddleDs();
947	977
948		- if(model.getType() == 1)
	978	+ //查询该月龄的年龄别体重值
	979	+ List<AwModel> aws = babyCheckService.queryBabyHealthConfig(monthAge, sex,0);
	980	+ if (CollectionUtils.isNotEmpty(aws) && aws.size() > 1)
949	981	{
950		- model = aws.get(1);
951		- model1 = aws.get(0);
952		- }
	982	+ AwModel model = aws.get(0);
	983	+ AwModel model1 = aws.get(1);
953	984
954		- //低于参考人群的年龄别体重的M -2s
955		- if (model.getRtwoDs() > weight)
956		- {
957		- growthEvaluate.add("低体重");
958		- }
959		- if (value != null)
960		- {
961		- //中位数百分比
962		- Double mp = weight/value;
963		- if (mp < 0.8)
	985	+ if(model.getType() == 1)
964	986	{
965		- growthEvaluate.add("重度消瘦");
	987	+ model = aws.get(1);
	988	+ model1 = aws.get(0);
966	989	}
967		- else if (0.8 <= mp && mp < 0.9)
	990	+
	991	+ //低于参考人群的年龄别体重的M -2s
	992	+ if (model.getRtwoDs() > weight)
968	993	{
969		- growthEvaluate.add("轻度消瘦");
	994	+ growthEvaluate.add("低体重");
970	995	}
971		- else if (1.1 < mp && mp <= 1.2)
	996	+ if (value != null)
972	997	{
973		- growthEvaluate.add("超重");
	998	+ //中位数百分比
	999	+ Double mp = weight/value;
	1000	+ if (mp < 0.8)
	1001	+ {
	1002	+ growthEvaluate.add("重度消瘦");
	1003	+ }
	1004	+ else if (0.8 <= mp && mp < 0.9)
	1005	+ {
	1006	+ growthEvaluate.add("轻度消瘦");
	1007	+ }
	1008	+ else if (1.1 < mp && mp <= 1.2)
	1009	+ {
	1010	+ growthEvaluate.add("超重");
	1011	+ }
	1012	+ else if ( mp > 1.2)
	1013	+ {
	1014	+ growthEvaluate.add("肥胖");
	1015	+ }
974	1016	}
975		- else if ( mp > 1.2)
	1017	+
	1018	+ if (weight > list.get(0).getPtwoDs() && height < model1.getRtwoDs())
976	1019	{
977		- growthEvaluate.add("肥胖");
	1020	+ growthEvaluate.add("生长迟缓");
978	1021	}
	1022	+ if (weight < list.get(0).getPtwoDs() && height < model1.getRtwoDs())
	1023	+ {
	1024	+ growthEvaluate.add("慢性严重营养不良");
	1025	+ }
979	1026	}
980		-
981		- if (weight > hmodel.getPlusSd() && height < model1.getRtwoDs())
982		- {
983		- growthEvaluate.add("生长迟缓");
984		- }
985		- if (weight < hmodel.getPlusSd() && height < model1.getRtwoDs())
986		- {
987		- growthEvaluate.add("慢性严重营养不良");
988		- }
989	1027	}
990		-
991	1028	BaseObjectResponse br = new BaseObjectResponse();
992	1029	br.setData(growthEvaluate);
993	1030	br.setErrorcode(ErrorCodeConstants.SUCCESS);

...	...	@@ -524,6 +524,11 @@
524	524	<artifactId>commons-dbutils</artifactId>
525	525	<version>1.6</version>
526	526	</dependency>
	527	+ <!--<dependency>-->
	528	+ <!--<groupId>com.microsoft.sqlserver</groupId>-->
	529	+ <!--<artifactId>sqljdbc4</artifactId>-->
	530	+ <!--<version>4.0</version>-->
	531	+ <!--</dependency>-->
527	532	</dependencies>
528	533	</project>