jiangjiazhi / regional-platform

Commit e2d70db4d68324fce83c3d12070ef58b9590af5c

Authored by shiyang over 3 years ago

Exists in master and in 6 other branches

update

Showing 9 changed files with 275 additions and 77 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/QhdBabyPsychology.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.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/facade/BabyCheckFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+import java.util.HashMap;
	4	+import java.util.Map;
	5	+
	6	+public enum QhdBabyPsychology {
	7	+
	8	+ //儿童心理行为发育问题预警征象
	9	+ phl1( 1, "对很大声音没有反应"),
	10	+ phl2( 2, "逗引时不发音或不会笑"),
	11	+ phl3( 3, "不注视人脸，不追视移动人或物"),
	12	+ phl4( 4, "俯卧时不会抬头"),
	13	+ phl5( 5, "发音少，不会笑出声"),
	14	+ phl6( 6, "不会伸手抓物"),
	15	+ phl7( 7, "紧握全松不开"),
	16	+ phl8( 8, "不能扶坐"),
	17	+ phl9( 9, "听到声音无应答"),
	18	+ phl10(10,"不会区分生人和熟人"),
	19	+ phl11(11,"双手间不会传递玩具"),
	20	+ phl12(12,"不会独坐"),
	21	+ phl13(13,"呼唤名字无反应"),
	22	+ phl14(14,"不会模仿“再见”或“欢迎”动作"),
	23	+ phl15(15,"不会用拇食指对捏小物品"),
	24	+ phl16(16,"不会扶物站立"),
	25	+ phl17(17,"不会有意识叫“爸爸”或“”"),
	26	+ phl18(18,"不会按要求指人或物"),
	27	+ phl19(19,"与人无目光交流"),
	28	+ phl20(20,"不会独走"),
	29	+ phl21(21,"不会说3个物品的名称"),
	30	+ phl22(22,"不会按吩咐做简单事情"),
	31	+ phl23(23,"不会用勺吃饭"),
	32	+ phl24(24,"不会扶栏上楼梯/台阶"),
	33	+ phl25(25,"不会说2-3个子的短语"),
	34	+ phl26(26,"兴趣单一，刻板"),
	35	+ phl27(27,"不会示意大小便"),
	36	+ phl28(28,"不会跑"),
	37	+ phl29(29,"不会说自己的名字"),
	38	+ phl30(30,"不会玩“拿棍当马琦”等假想游戏"),
	39	+ phl31(31,"不会模仿画圆"),
	40	+ phl32(32,"不会双脚跳"),
	41	+ phl33(33,"不会说带形容词的句子"),
	42	+ phl34(34,"不能按要求等待或轮流"),
	43	+ phl35(35,"不会独立穿衣"),
	44	+ phl36(36,"不会单脚站立"),
	45	+ phl37(37,"不能简单叙述说事情经过"),
	46	+ phl38(38,"不知道自己的性别"),
	47	+ phl39(39,"不会用筷子吃饭"),
	48	+ phl40(40,"不会单脚跳"),
	49	+ phl41(41,"不会表达自己的感受或想法"),
	50	+ phl42(42,"不会玩角色扮演的集体游戏"),
	51	+ phl43(43,"不会画方形"),
	52	+ phl44(44,"不会奔跑"),
	53	+
	54	+ ;
	55	+ private Integer id;
	56	+ private String name;
	57	+
	58	+ public Integer getId() {
	59	+ return id;
	60	+ }
	61	+
	62	+ public void setId(Integer id) {
	63	+ this.id = id;
	64	+ }
	65	+
	66	+ public String getName() {
	67	+ return name;
	68	+ }
	69	+
	70	+ public void setName(String name) {
	71	+ this.name = name;
	72	+ }
	73	+
	74	+ private QhdBabyPsychology(Integer id, String name) {
	75	+ this.id = id;
	76	+ this.name = name;
	77	+ }
	78	+
	79	+ public static String getName(Integer id){
	80	+ if(null!=id){
	81	+ for (QhdBabyPsychology value : values()) {
	82	+ if (id == value.getId()) {
	83	+ return value.getName();
	84	+ }
	85	+ }
	86	+ }
	87	+ return null;
	88	+ }
	89	+ public static Map<Integer,String> getMap() {
	90	+ Map<Integer,String> map =new HashMap<>();
	91	+ for (QhdBabyPsychology value : values()) {
	92	+ map.put(value.getId(), value.getName());
	93	+ }
	94	+ return map;
	95	+ }
	96	+}

...	...	@@ -556,6 +556,33 @@
556	556	/********************************************/
557	557
558	558
	559	+ /**
	560	+ * 秦皇岛-发育筛查模块
	561	+ *
	562	+ */
	563	+ //发育评估
	564	+ private String developAssess;
	565	+ //其它
	566	+ private String screeningOther;
	567	+
	568	+ public String getDevelopAssess() {
	569	+ return developAssess;
	570	+ }
	571	+
	572	+ public void setDevelopAssess(String developAssess) {
	573	+ this.developAssess = developAssess;
	574	+ }
	575	+
	576	+ public String getScreeningOther() {
	577	+ return screeningOther;
	578	+ }
	579	+
	580	+ public void setScreeningOther(String screeningOther) {
	581	+ this.screeningOther = screeningOther;
	582	+ }
	583	+
	584	+ /***********************************************/
	585	+
559	586	public Integer getCheckDay() {
560	587	return checkDay;
561	588	}

1		-//package com.lyms.platform.operate.web;
2		-//
3		-//import org.apache.http.HttpEntity;
4		-//import org.apache.http.client.ClientProtocolException;
5		-//import org.apache.http.client.config.RequestConfig;
6		-//import org.apache.http.client.methods.CloseableHttpResponse;
7		-//import org.apache.http.client.methods.HttpPost;
8		-//import org.apache.http.entity.ContentType;
9		-//import org.apache.http.entity.mime.MultipartEntityBuilder;
10		-//import org.apache.http.entity.mime.content.FileBody;
11		-//import org.apache.http.entity.mime.content.StringBody;
12		-//import org.apache.http.impl.client.CloseableHttpClient;
13		-//import org.apache.http.impl.client.HttpClients;
14		-//import org.apache.http.util.EntityUtils;
15		-//
16		-//import java.io.File;
17		-//import java.io.IOException;
18		-//
19		-///**
20		-// * Created by Administrator on 2016/8/22 0022.
21		-// */
22		-//public class Test {
23		-//
24		-// final static long TIME = 1000 * 90;
25		-//
26		-// public static void main(String[] args) throws Exception {
27		-//
28		-// File dir = new File("F:\\aa");
29		-// File[] files = dir.listFiles();
30		-// for (File file : files)
31		-// {
32		-// upload("https://cert-qhd-api.healthbaby.com.cn:18020/cp/common/importSignature", file, file.getName());
33		-// Thread.sleep(TIME);
34		-// }
35		-// }
36		-//
37		-//
38		-// public static void upload(String url,File file,String filename) {
39		-// CloseableHttpClient httpclient = HttpClients.createDefault();
40		-// try {
41		-// HttpPost httppost = new HttpPost(url);
42		-// RequestConfig requestConfig = RequestConfig.custom().setConnectTimeout(2000000).setSocketTimeout(2000000).build();
43		-// httppost.setConfig(requestConfig);
44		-// FileBody bin = new FileBody(file);
45		-// StringBody comment = new StringBody(filename, ContentType.TEXT_PLAIN);
46		-// HttpEntity reqEntity = MultipartEntityBuilder.create().addPart("file", bin).addPart("filename", comment).build();
47		-// httppost.setEntity(reqEntity);
48		-// httppost.setHeader("Authorization","18674e5b23b200f86a6210ea2f1006a8");
49		-// CloseableHttpResponse response = httpclient.execute(httppost);
50		-// try {
51		-// System.out.println(response.getStatusLine());
52		-// HttpEntity resEntity = response.getEntity();
53		-// if (resEntity != null) {
54		-// String responseEntityStr = EntityUtils.toString(response.getEntity());
55		-// System.out.println(file.getName()+"===="+responseEntityStr);
56		-// }
57		-// EntityUtils.consume(resEntity);
58		-// } finally {
59		-// response.close();
60		-// }
61		-// } catch (ClientProtocolException e) {
62		-// e.printStackTrace();
63		-// } catch (IOException e) {
64		-// e.printStackTrace();
65		-// } finally {
66		-// try {
67		-// httpclient.close();
68		-// } catch (IOException e) {
69		-// e.printStackTrace();
70		-// }
71		-// }
72		-// }
73		-//
74		-//}
75		-//
76		-//
	1	+package com.lyms.platform.operate.web;
	2	+
	3	+import com.alibaba.fastjson.JSON;
	4	+import com.lyms.platform.common.enums.QhdBasicOrganization;
	5	+import com.lyms.platform.common.enums.QhdKindergarten;
	6	+import com.lyms.platform.common.result.RespBuilder;
	7	+import com.lyms.platform.pojo.BabyEyeCheck;
	8	+import org.apache.http.HttpEntity;
	9	+import org.apache.http.client.ClientProtocolException;
	10	+import org.apache.http.client.config.RequestConfig;
	11	+import org.apache.http.client.methods.CloseableHttpResponse;
	12	+import org.apache.http.client.methods.HttpPost;
	13	+import org.apache.http.entity.ContentType;
	14	+import org.apache.http.impl.client.CloseableHttpClient;
	15	+import org.apache.http.impl.client.HttpClients;
	16	+import org.apache.http.util.EntityUtils;
	17	+
	18	+import java.io.File;
	19	+import java.io.IOException;
	20	+import java.util.ArrayList;
	21	+import java.util.List;
	22	+
	23	+/**
	24	+ * Created by Administrator on 2016/8/22 0022.
	25	+ */
	26	+public class Test {
	27	+
	28	+ final static long TIME = 1000 * 90;
	29	+
	30	+ public static void main(String[] args) throws Exception {
	31	+ BabyEyeCheck babyEyeCheck=new BabyEyeCheck();
	32	+ System.out.println(JSON.toJSON(QhdKindergarten.getMap()));
	33	+
	34	+ }
	35	+
	36	+
	37	+
	38	+
	39	+}

...	...	@@ -6,8 +6,12 @@
6	6	import com.lyms.platform.common.base.LoginContext;
7	7	import com.lyms.platform.common.constants.ErrorCodeConstants;
8	8	import com.lyms.platform.common.dao.BaseQuery;
	9	+import com.lyms.platform.common.enums.QhdBabyPsychology;
	10	+import com.lyms.platform.common.enums.QhdBasicOrganization;
	11	+import com.lyms.platform.common.enums.QhdKindergarten;
9	12	import com.lyms.platform.common.result.BaseObjectResponse;
10	13	import com.lyms.platform.common.result.BaseResponse;
	14	+import com.lyms.platform.common.result.RespBuilder;
11	15	import com.lyms.platform.common.utils.StringUtils;
12	16	import com.lyms.platform.operate.web.facade.AutoMatchFacade;
13	17	import com.lyms.platform.operate.web.facade.BabyCheckFacade;
...	...	@@ -20,6 +24,8 @@
20	24
21	25	import javax.servlet.http.HttpServletRequest;
22	26	import javax.validation.Valid;
	27	+import java.util.HashMap;
	28	+import java.util.Map;
23	29
24	30
25	31	/**
...	...	@@ -586,6 +592,18 @@
586	592	public BaseResponse getBabyManageRateCount(@RequestParam(required = false) String checkTime,
587	593	HttpServletRequest request) {
588	594	return babyCheckFacade.getBabyManageRateCount(checkTime, getUserId(request));
	595	+ }
	596	+ /**
	597	+ *儿童心理行为发育问题预警征象数据接口
	598	+ *
	599	+ * @return
	600	+ */
	601	+ @RequestMapping(method = RequestMethod.GET, value = "/getQhdBabyPsychology")
	602	+ @ResponseBody
	603	+ public BaseResponse getQhdQhdBabyPsychology() {
	604	+ Map<String, Map<Integer, String>> map=new HashMap<>();
	605	+ map.put("QhdBabyPsychology", QhdBabyPsychology.getMap());
	606	+ return RespBuilder.buildSuccess(map);
589	607	}
590	608	}

...	...	@@ -606,6 +606,10 @@
606	606	model.setTcmGuide(request.getTcmGuide());
607	607	model.setWcOtherHighRisk(request.getWcOtherHighRisk());
608	608
	609	+ //秦皇岛-发育筛查模块
	610	+ model.setDevelopAssess(StringUtils.isNotEmpty(request.getDevelopAssess())?request.getDevelopAssess():"");
	611	+ model.setScreeningOther(StringUtils.isNotEmpty(request.getScreeningOther())?request.getScreeningOther():"");
	612	+
609	613	return model;
610	614	}
611	615
...	...	@@ -2364,7 +2368,9 @@
2364	2368	//新加中医指导
2365	2369	model.setTcmGuide(checkModel.getTcmGuide());
2366	2370	model.setWcOtherHighRisk(checkModel.getWcOtherHighRisk());
2367		-
	2371	+ //秦皇岛-发育筛查模块
	2372	+ model.setDevelopAssess(StringUtils.isNotEmpty(checkModel.getDevelopAssess())?checkModel.getDevelopAssess():"");
	2373	+ model.setScreeningOther(StringUtils.isNotEmpty(checkModel.getScreeningOther())?checkModel.getScreeningOther():"");
2368	2374	return model;
2369	2375
2370	2376	}

...	...	@@ -6323,6 +6323,10 @@
6323	6323	model.setZhipJoint(checkModel.getZhipJoint());
6324	6324	model.setYhipJoint(checkModel.getYhipJoint());
6325	6325
	6326	+ //秦皇岛-发育筛查模块
	6327	+ model.setDevelopAssess(StringUtils.isNotEmpty(checkModel.getDevelopAssess())?checkModel.getDevelopAssess():"");
	6328	+ model.setScreeningOther(StringUtils.isNotEmpty(checkModel.getScreeningOther())?checkModel.getScreeningOther():"");
	6329	+
6326	6330	return model;
6327	6331
6328	6332	}

...	...	@@ -518,6 +518,32 @@
518	518	//儿童疾病
519	519	private List<String> diseases;
520	520
	521	+ /**
	522	+ * 秦皇岛-发育筛查模块
	523	+ *
	524	+ */
	525	+ //发育评估
	526	+ private String developAssess;
	527	+ //其它
	528	+ private String screeningOther;
	529	+
	530	+ public String getDevelopAssess() {
	531	+ return developAssess;
	532	+ }
	533	+
	534	+ public void setDevelopAssess(String developAssess) {
	535	+ this.developAssess = developAssess;
	536	+ }
	537	+
	538	+ public String getScreeningOther() {
	539	+ return screeningOther;
	540	+ }
	541	+
	542	+ public void setScreeningOther(String screeningOther) {
	543	+ this.screeningOther = screeningOther;
	544	+ }
	545	+
	546	+ /***********************************************/
521	547
522	548	public String getTcmGuide() {
523	549	return tcmGuide;

...	...	@@ -722,6 +722,35 @@
722	722
723	723	/********************************************/
724	724
	725	+ /********************************************/
	726	+
	727	+ /**
	728	+ * 秦皇岛-发育筛查模块
	729	+ *
	730	+ */
	731	+ //发育评估
	732	+ private String developAssess;
	733	+ //其它
	734	+ private String screeningOther;
	735	+
	736	+ public String getDevelopAssess() {
	737	+ return developAssess;
	738	+ }
	739	+
	740	+ public void setDevelopAssess(String developAssess) {
	741	+ this.developAssess = developAssess;
	742	+ }
	743	+
	744	+ public String getScreeningOther() {
	745	+ return screeningOther;
	746	+ }
	747	+
	748	+ public void setScreeningOther(String screeningOther) {
	749	+ this.screeningOther = screeningOther;
	750	+ }
	751	+
	752	+ /***********************************************/
	753	+
725	754	public String getTcmGuide() {
726	755	return tcmGuide;
727	756	}

...	...	@@ -758,6 +758,33 @@
758	758
759	759	/********************************************/
760	760
	761	+ /**
	762	+ * 秦皇岛-发育筛查模块
	763	+ *
	764	+ */
	765	+ //发育评估
	766	+ private String developAssess;
	767	+ //其它
	768	+ private String screeningOther;
	769	+
	770	+ public String getDevelopAssess() {
	771	+ return developAssess;
	772	+ }
	773	+
	774	+ public void setDevelopAssess(String developAssess) {
	775	+ this.developAssess = developAssess;
	776	+ }
	777	+
	778	+ public String getScreeningOther() {
	779	+ return screeningOther;
	780	+ }
	781	+
	782	+ public void setScreeningOther(String screeningOther) {
	783	+ this.screeningOther = screeningOther;
	784	+ }
	785	+
	786	+ /***********************************************/
	787	+
761	788	public String getExerciseIA() {
762	789	return exerciseIA;
763	790	}