jiangjiazhi / regional-platform

1		-<component name="libraryTable">
2		- <library name="Maven: org.apache.commons:commons-lang3:3.4">
3		- <CLASSES>
4		- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4.jar!/" />
5		- </CLASSES>
6		- <JAVADOC>
7		- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-javadoc.jar!/" />
8		- </JAVADOC>
9		- <SOURCES>
10		- <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-lang3/3.4/commons-lang3-3.4-sources.jar!/" />
11		- </SOURCES>
12		- </library>
13		-</component>

...	...	@@ -299,7 +299,7 @@
299	299	</foreach>
300	300	)
301	301	</if>
302		- /根据儿童id进行查询/
	302	+
303	303	<if test="babyIds!=null">
304	304	and sc.baby_id in (
305	305	<foreach item="bId" collection="babyIds" separator=",">

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+/**
	4	+ * 前囟闭合/未闭合
	5	+ * Created by lt on 2017/7/18 0018
	6	+ */
	7	+public enum BregmaticEnums {
	8	+ NORMAL(1, "闭合"),
	9	+ BOMBE(2, "未闭合");
	10	+
	11	+ private Integer id;
	12	+ private String name;
	13	+
	14	+ public static BregmaticEnums get(Integer id) {
	15	+ BregmaticEnums[] values = BregmaticEnums.values();
	16	+ for (BregmaticEnums value : values) {
	17	+ if (value.getId() == id) {
	18	+ return value;
	19	+ }
	20	+ }
	21	+ return null;
	22	+ }
	23	+
	24	+ BregmaticEnums(Integer id, String name){
	25	+ this.id = id;
	26	+ this.name = name;
	27	+ }
	28	+
	29	+ public Integer getId() {
	30	+ return id;
	31	+ }
	32	+
	33	+ public void setId(Integer id) {
	34	+ this.id = id;
	35	+ }
	36	+
	37	+ public String getName() {
	38	+ return name;
	39	+ }
	40	+
	41	+ public void setName(String name) {
	42	+ this.name = name;
	43	+ }
	44	+}

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+/**
	4	+ * 面色红润/黄染/其他
	5	+ * Created by lt on 2017/7/18 0018
	6	+ */
	7	+public enum ComplexionEnums {
	8	+ RED(1, "红润"),
	9	+ YELLOW(2, "黄染"),
	10	+ OTHER(3, "其他");
	11	+
	12	+ private Integer id;
	13	+ private String name;
	14	+
	15	+ public static ComplexionEnums get(Integer id) {
	16	+ ComplexionEnums[] values = ComplexionEnums.values();
	17	+ for (ComplexionEnums value : values) {
	18	+ if (value.getId() == id) {
	19	+ return value;
	20	+ }
	21	+ }
	22	+ return null;
	23	+ }
	24	+
	25	+ ComplexionEnums(Integer id, String name){
	26	+ this.id = id;
	27	+ this.name = name;
	28	+ }
	29	+
	30	+ public Integer getId() {
	31	+ return id;
	32	+ }
	33	+
	34	+ public void setId(Integer id) {
	35	+ this.id = id;
	36	+ }
	37	+
	38	+ public String getName() {
	39	+ return name;
	40	+ }
	41	+
	42	+ public void setName(String name) {
	43	+ this.name = name;
	44	+ }
	45	+}

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+/**
	4	+ * 喂养方式纯母乳/混合/人工
	5	+ * Created by lt on 2017/7/18 0018
	6	+ */
	7	+public enum FeedTypeEnums {
	8	+ MURU(1, "纯母乳"),
	9	+ HUNHE(2, "混合"),
	10	+ RENGONG(3, "人工");
	11	+
	12	+ private Integer id;
	13	+ private String name;
	14	+
	15	+ public static FeedTypeEnums get(Integer id) {
	16	+ FeedTypeEnums[] values = FeedTypeEnums.values();
	17	+ for (FeedTypeEnums value : values) {
	18	+ if (value.getId() == id) {
	19	+ return value;
	20	+ }
	21	+ }
	22	+ return null;
	23	+ }
	24	+
	25	+ FeedTypeEnums(Integer id, String name){
	26	+ this.id = id;
	27	+ this.name = name;
	28	+ }
	29	+
	30	+ public Integer getId() {
	31	+ return id;
	32	+ }
	33	+
	34	+ public void setId(Integer id) {
	35	+ this.id = id;
	36	+ }
	37	+
	38	+ public String getName() {
	39	+ return name;
	40	+ }
	41	+
	42	+ public void setName(String name) {
	43	+ this.name = name;
	44	+ }
	45	+}

...	...	@@ -7,6 +7,35 @@
7	7	*/
8	8	public class HdEnums {
9	9
	10	+ public enum HandlingSuggestionEnums {
	11	+ QZNRSF(1, "确诊纳入随访"),
	12	+ WFXWT(2, "未发现问题");
	13	+
	14	+ private int id;
	15	+ private String name;
	16	+
	17	+ HandlingSuggestionEnums(int id, String name) {
	18	+ this.id = id;
	19	+ this.name = name;
	20	+ }
	21	+
	22	+ public int getId() {
	23	+ return id;
	24	+ }
	25	+
	26	+ public void setId(int id) {
	27	+ this.id = id;
	28	+ }
	29	+
	30	+ public String getName() {
	31	+ return name;
	32	+ }
	33	+
	34	+ public void setName(String name) {
	35	+ this.name = name;
	36	+ }
	37	+ }
	38	+
10	39	public enum IsConfirmEnums {
11	40	BY(1, "已确诊"),
12	41	WY(2, "待确诊");

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+/**
	4	+ * 下次访视时间：出生0-42天
	5	+ * Created by lt on 2017/7/18 0018
	6	+ */
	7	+public enum NextVisitTimeEnums {
	8	+ Birth_0(0, "出生第0天"),
	9	+ Birth_1(1, "出生第1天"),
	10	+ Birth_2(2, "出生第2天"),
	11	+ Birth_3(3, "出生第3天"),
	12	+ Birth_4(4, "出生第4天"),
	13	+ Birth_5(5, "出生第5天"),
	14	+ Birth_6(6, "出生第6天"),
	15	+ Birth_7(7, "出生第7天"),
	16	+ Birth_8(8, "出生第8天"),
	17	+ Birth_9(9, "出生第9天"),
	18	+ Birth_10(10, "出生第10天"),
	19	+ Birth_11(11, "出生第11天"),
	20	+ Birth_12(12, "出生第12天"),
	21	+ Birth_13(13, "出生第13天"),
	22	+ Birth_14(14, "出生第14天"),
	23	+ Birth_15(15, "出生第15天"),
	24	+ Birth_16(16, "出生第16天"),
	25	+ Birth_17(17, "出生第17天"),
	26	+ Birth_18(18, "出生第18天"),
	27	+ Birth_19(19, "出生第19天"),
	28	+ Birth_20(20, "出生第20天"),
	29	+ Birth_21(21, "出生第21天"),
	30	+ Birth_22(22, "出生第22天"),
	31	+ Birth_23(23, "出生第23天"),
	32	+ Birth_24(24, "出生第24天"),
	33	+ Birth_25(25, "出生第25天"),
	34	+ Birth_26(26, "出生第26天"),
	35	+ Birth_27(27, "出生第27天"),
	36	+ Birth_28(28, "出生第28天"),
	37	+ Birth_29(29, "出生第29天"),
	38	+ Birth_30(30, "出生第30天"),
	39	+ Birth_31(31, "出生第31天"),
	40	+ Birth_32(32, "出生第32天"),
	41	+ Birth_33(33, "出生第33天"),
	42	+ Birth_34(34, "出生第34天"),
	43	+ Birth_35(35, "出生第35天"),
	44	+ Birth_36(36, "出生第36天"),
	45	+ Birth_37(37, "出生第37天"),
	46	+ Birth_38(38, "出生第38天"),
	47	+ Birth_39(39, "出生第39天"),
	48	+ Birth_40(40, "出生第40天"),
	49	+ Birth_41(41, "出生第41天"),
	50	+ Birth_42(42, "出生第42天");
	51	+
	52	+ private Integer id;
	53	+ private String name;
	54	+
	55	+ public static FeedTypeEnums get(Integer id) {
	56	+ FeedTypeEnums[] values = FeedTypeEnums.values();
	57	+ for (FeedTypeEnums value : values) {
	58	+ if (value.getId() == id) {
	59	+ return value;
	60	+ }
	61	+ }
	62	+ return null;
	63	+ }
	64	+
	65	+ NextVisitTimeEnums(Integer id, String name){
	66	+ this.id = id;
	67	+ this.name = name;
	68	+ }
	69	+
	70	+ public Integer getId() {
	71	+ return id;
	72	+ }
	73	+
	74	+ public void setId(Integer id) {
	75	+ this.id = id;
	76	+ }
	77	+
	78	+ public String getName() {
	79	+ return name;
	80	+ }
	81	+
	82	+ public void setName(String name) {
	83	+ this.name = name;
	84	+ }
	85	+}

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+/**
	4	+ * 皮肤枚举未见异常/湿疹/糜烂/其他
	5	+ * Created by lt on 2017/7/18 0018
	6	+ */
	7	+public enum SkinEnums {
	8	+ NO_ERROR(1, "未见异常"),
	9	+ ECZEMA(2, "湿疹"),
	10	+ EROSION(3, "糜烂"),
	11	+ OTHER(4, "其他");
	12	+
	13	+ private Integer id;
	14	+ private String name;
	15	+
	16	+ public static FeedTypeEnums get(Integer id) {
	17	+ FeedTypeEnums[] values = FeedTypeEnums.values();
	18	+ for (FeedTypeEnums value : values) {
	19	+ if (value.getId() == id) {
	20	+ return value;
	21	+ }
	22	+ }
	23	+ return null;
	24	+ }
	25	+
	26	+ SkinEnums(Integer id, String name){
	27	+ this.id = id;
	28	+ this.name = name;
	29	+ }
	30	+
	31	+ public Integer getId() {
	32	+ return id;
	33	+ }
	34	+
	35	+ public void setId(Integer id) {
	36	+ this.id = id;
	37	+ }
	38	+
	39	+ public String getName() {
	40	+ return name;
	41	+ }
	42	+
	43	+ public void setName(String name) {
	44	+ this.name = name;
	45	+ }
	46	+}

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+/**
	4	+ * 脐带未脱/脱落/脐部有渗出/其他
	5	+ * Created by lt on 2017/7/18 0018
	6	+ */
	7	+public enum UmbilicalCordEnums {
	8	+ NOT_OFF(1, "未脱"),
	9	+ FALL_OFF(2, "脱落"),
	10	+ NAVEL(3, "脐部有渗出"),
	11	+ OTHER(4, "其他");
	12	+
	13	+ private Integer id;
	14	+ private String name;
	15	+
	16	+ public static UmbilicalCordEnums get(Integer id) {
	17	+ UmbilicalCordEnums[] values = UmbilicalCordEnums.values();
	18	+ for (UmbilicalCordEnums value : values) {
	19	+ if (value.getId() == id) {
	20	+ return value;
	21	+ }
	22	+ }
	23	+ return null;
	24	+ }
	25	+
	26	+ UmbilicalCordEnums(Integer id, String name){
	27	+ this.id = id;
	28	+ this.name = name;
	29	+ }
	30	+
	31	+ public Integer getId() {
	32	+ return id;
	33	+ }
	34	+
	35	+ public void setId(Integer id) {
	36	+ this.id = id;
	37	+ }
	38	+
	39	+ public String getName() {
	40	+ return name;
	41	+ }
	42	+
	43	+ public void setName(String name) {
	44	+ this.name = name;
	45	+ }
	46	+}

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+/**
	4	+ * 是否呕吐
	5	+ * Created by lt on 2017/7/18 0018
	6	+ */
	7	+public enum VomitEnums {
	8	+ YES(1, "是"),
	9	+ NO(2, "否");
	10	+
	11	+ private Integer id;
	12	+ private String name;
	13	+
	14	+ public static VomitEnums get(Integer id) {
	15	+ VomitEnums[] values = VomitEnums.values();
	16	+ for (VomitEnums value : values) {
	17	+ if (value.getId() == id) {
	18	+ return value;
	19	+ }
	20	+ }
	21	+ return null;
	22	+ }
	23	+
	24	+ VomitEnums(Integer id, String name){
	25	+ this.id = id;
	26	+ this.name = name;
	27	+ }
	28	+
	29	+ public Integer getId() {
	30	+ return id;
	31	+ }
	32	+
	33	+ public void setId(Integer id) {
	34	+ this.id = id;
	35	+ }
	36	+
	37	+ public String getName() {
	38	+ return name;
	39	+ }
	40	+
	41	+ public void setName(String name) {
	42	+ this.name = name;
	43	+ }
	44	+}

...	...	@@ -27,7 +27,9 @@
27	27	COUPON_NOT_UNIQUE(1002, "优惠券有多个"),
28	28	COUPON_TIME_OUT(1003, "当前优惠券不在使用时间范围内"),
29	29	COUPON_IS_USERD(1004, "优惠券已被使用"),
30		- COUPON_IS_DISABLED(1005, "优惠券已被禁用");
	30	+ COUPON_IS_DISABLED(1005, "优惠券已被禁用"),
	31	+
	32	+ NEED_BUILD(1101, "未找到建档信息");
31	33
32	34	private Integer code;
33	35	private String msg;

...	...	@@ -464,31 +464,51 @@
464	464
465	465
466	466	public static Date addDay(Date srcDate, int days) {
467		- Calendar rightNow = Calendar.getInstance();
468		- rightNow.setTime(srcDate);
469		- rightNow.add(Calendar.DAY_OF_YEAR, days);
470		- return rightNow.getTime();
	467	+ try {
	468	+ lock.lock();
	469	+ Calendar rightNow = Calendar.getInstance();
	470	+ rightNow.setTime(srcDate);
	471	+ rightNow.add(Calendar.DAY_OF_YEAR, days);
	472	+ return rightNow.getTime();
	473	+ }finally {
	474	+ lock.unlock();
	475	+ }
471	476	}
472	477
473	478	public static Date addMonth(Date srcDate, int month) {
474		- Calendar rightNow = Calendar.getInstance();
475		- rightNow.setTime(srcDate);
476		- rightNow.add(Calendar.MONTH, month);
477		- return rightNow.getTime();
	479	+ try {
	480	+ lock.lock();
	481	+ Calendar rightNow = Calendar.getInstance();
	482	+ rightNow.setTime(srcDate);
	483	+ rightNow.add(Calendar.MONTH, month);
	484	+ return rightNow.getTime();
	485	+ }finally {
	486	+ lock.unlock();
	487	+ }
478	488	}
479	489
480	490	public static Date addYear(Date srcDate, int year) {
481		- Calendar rightNow = Calendar.getInstance();
482		- rightNow.setTime(srcDate);
483		- rightNow.add(Calendar.YEAR, year);
484		- return rightNow.getTime();
	491	+ try {
	492	+ lock.lock();
	493	+ Calendar rightNow = Calendar.getInstance();
	494	+ rightNow.setTime(srcDate);
	495	+ rightNow.add(Calendar.YEAR, year);
	496	+ return rightNow.getTime();
	497	+ }finally {
	498	+ lock.unlock();
	499	+ }
485	500	}
486	501
487	502	public static Date addWeek(Date srcDate, int weak) {
488		- Calendar rightNow = Calendar.getInstance();
489		- rightNow.setTime(srcDate);
490		- rightNow.add(Calendar.WEEK_OF_YEAR, weak);
491		- return rightNow.getTime();
	503	+ try {
	504	+ lock.lock();
	505	+ Calendar rightNow = Calendar.getInstance();
	506	+ rightNow.setTime(srcDate);
	507	+ rightNow.add(Calendar.WEEK_OF_YEAR, weak);
	508	+ return rightNow.getTime();
	509	+ }finally {
	510	+ lock.unlock();
	511	+ }
492	512	}
493	513
494	514

...	...	@@ -108,14 +108,24 @@
108	108	private String lungs;
109	109	//外阴
110	110	private String vulva;
	111	+ //外阴选项
	112	+ private String vulvaSele;
111	113	//阴道
112	114	private String vagina;
	115	+ //阴道选项
	116	+ private String vaginaSele;
113	117	// 宫颈
114	118	private String cervical;
	119	+ // 宫颈选项
	120	+ private String cervicalSele;
115	121	//子宫
116	122	private String uterus;
	123	+ //子宫选项
	124	+ private String uterusSele;
117	125	//附件
118	126	private String fujian;
	127	+ //附件选项
	128	+ private String fujianSele;
119	129	private Date created;
120	130	private String hospitalId;
121	131	private String bp;
122	132
123	133
...	...	@@ -650,8 +660,45 @@
650	660	this.cestationInfo = cestationInfo;
651	661	}
652	662
	663	+ public String getVulvaSele() {
	664	+ return vulvaSele;
	665	+ }
653	666
	667	+ public void setVulvaSele(String vulvaSele) {
	668	+ this.vulvaSele = vulvaSele;
	669	+ }
654	670
	671	+ public String getVaginaSele() {
	672	+ return vaginaSele;
	673	+ }
	674	+
	675	+ public void setVaginaSele(String vaginaSele) {
	676	+ this.vaginaSele = vaginaSele;
	677	+ }
	678	+
	679	+ public String getCervicalSele() {
	680	+ return cervicalSele;
	681	+ }
	682	+
	683	+ public void setCervicalSele(String cervicalSele) {
	684	+ this.cervicalSele = cervicalSele;
	685	+ }
	686	+
	687	+ public String getUterusSele() {
	688	+ return uterusSele;
	689	+ }
	690	+
	691	+ public void setUterusSele(String uterusSele) {
	692	+ this.uterusSele = uterusSele;
	693	+ }
	694	+
	695	+ public String getFujianSele() {
	696	+ return fujianSele;
	697	+ }
	698	+
	699	+ public void setFujianSele(String fujianSele) {
	700	+ this.fujianSele = fujianSele;
	701	+ }
655	702
656	703	public String getDiagnosis() {
657	704	return diagnosis;

	1	+package com.lyms.platform.pojo;
	2	+
	3	+import org.aspectj.lang.annotation.Before;
	4	+import org.springframework.data.mongodb.core.mapping.Document;
	5	+
	6	+import java.util.Date;
	7	+
	8	+/**
	9	+ * Created by lt on 2017/7/18 0018
	10	+ * 新生儿访视
	11	+ */
	12	+@Document(collection="lyms_newborn_visit")
	13	+public class NewbornVisit {
	14	+
	15	+ private String id;
	16	+
	17	+ private Date created;
	18	+
	19	+ private String yn;
	20	+
	21	+ // 操作人ID
	22	+ private String operationId;
	23	+
	24	+ private String hospitalId;
	25	+
	26	+ private String parentId;
	27	+
	28	+ private String babyId;
	29	+
	30	+ private String pid;
	31	+
	32	+ // 访视时间
	33	+ private Date checkTime;
	34	+
	35	+ // 访视时间中文版 (比如出生xx天)
	36	+ private String checkTimeDesc;
	37	+
	38	+ // 访视机构
	39	+ private String visitHospitalId;
	40	+
	41	+ // 喂养方式纯母乳/混合/人工
	42	+ private String feedType;
	43	+
	44	+ // 喂奶量
	45	+ private String feedNumber;
	46	+
	47	+ // 吃奶次数
	48	+ private Integer nurseNumber;
	49	+
	50	+ // 新生儿体重
	51	+ private String weight;
	52	+
	53	+ // 出生身长
	54	+ private String height;
	55	+
	56	+ // 是否呕吐
	57	+ private String vomit;
	58	+
	59	+ // 大便
	60	+ private String shit;
	61	+
	62	+ // 大便次数
	63	+ private Integer shitNumber;
	64	+
	65	+ // 体温
	66	+ private String temperature;
	67	+
	68	+ // 现在体重
	69	+ private String weightNow;
	70	+
	71	+ // 心率
	72	+ private String heartRate;
	73	+
	74	+ // 呼吸频率
	75	+ private String respiratoryRate;
	76	+
	77	+ // 皮肤未见异常/湿疹/糜烂/其他
	78	+ private String skin;
	79	+
	80	+ // 面色红润/黄染/其他
	81	+ private String complexion;
	82	+
	83	+ // 黄染部位
	84	+ private String ictericPart;
	85	+
	86	+ // 前囟正常/膨隆/凹陷/其他
	87	+ private String bregmatic;
	88	+
	89	+ // 未闭合尺寸
	90	+ private String unclosedSize;
	91	+
	92	+ // 眼外观
	93	+ private String eye;
	94	+
	95	+ // 四肢活动
	96	+ private String limb;
	97	+
	98	+ // 耳外观
	99	+ private String ear;
	100	+
	101	+ // 颈部包块
	102	+ private String neck;
	103	+
	104	+ // 鼻
	105	+ private String nose;
	106	+
	107	+ // 口腔
	108	+ private String mouth;
	109	+
	110	+ // 肛门
	111	+ private String gangmen;
	112	+
	113	+ // 心肺听诊
	114	+ private String heartLung;
	115	+
	116	+ // 脐带未脱/脱落/脐部有渗出/其他
	117	+ private String umbilicalCord;
	118	+
	119	+ // 腹部
	120	+ private String abdomen;
	121	+
	122	+ // 脊柱
	123	+ private String spine;
	124	+
	125	+ // 外生殖器
	126	+ private String extGenitalia;
	127	+
	128	+ // 诊断
	129	+ private String diagnosis;
	130	+
	131	+ // 处理意见
	132	+ private String handleOpinions;
	133	+
	134	+ // 指导意见
	135	+ private String guidanceOpinion;
	136	+
	137	+ // 医生
	138	+ private String doctor;
	139	+
	140	+ // 访视地点
	141	+ private String visitLocation;
	142	+
	143	+ // 下次访视时间前端是枚举：出生0-42天
	144	+ private Date nextVisitTime;
	145	+
	146	+ // 下次访视时间说明
	147	+ private String nextVisitTimeDesc;
	148	+
	149	+ public String getId() {
	150	+ return id;
	151	+ }
	152	+
	153	+ public void setId(String id) {
	154	+ this.id = id;
	155	+ }
	156	+
	157	+ public Date getCreated() {
	158	+ return created;
	159	+ }
	160	+
	161	+ public void setCreated(Date created) {
	162	+ this.created = created;
	163	+ }
	164	+
	165	+ public String getYn() {
	166	+ return yn;
	167	+ }
	168	+
	169	+ public void setYn(String yn) {
	170	+ this.yn = yn;
	171	+ }
	172	+
	173	+ public String getOperationId() {
	174	+ return operationId;
	175	+ }
	176	+
	177	+ public void setOperationId(String operationId) {
	178	+ this.operationId = operationId;
	179	+ }
	180	+
	181	+ public String getHospitalId() {
	182	+ return hospitalId;
	183	+ }
	184	+
	185	+ public void setHospitalId(String hospitalId) {
	186	+ this.hospitalId = hospitalId;
	187	+ }
	188	+
	189	+ public String getParentId() {
	190	+ return parentId;
	191	+ }
	192	+
	193	+ public void setParentId(String parentId) {
	194	+ this.parentId = parentId;
	195	+ }
	196	+
	197	+ public String getBabyId() {
	198	+ return babyId;
	199	+ }
	200	+
	201	+ public void setBabyId(String babyId) {
	202	+ this.babyId = babyId;
	203	+ }
	204	+
	205	+ public String getPid() {
	206	+ return pid;
	207	+ }
	208	+
	209	+ public void setPid(String pid) {
	210	+ this.pid = pid;
	211	+ }
	212	+
	213	+ public Date getCheckTime() {
	214	+ return checkTime;
	215	+ }
	216	+
	217	+ public void setCheckTime(Date checkTime) {
	218	+ this.checkTime = checkTime;
	219	+ }
	220	+
	221	+ public String getCheckTimeDesc() {
	222	+ return checkTimeDesc;
	223	+ }
	224	+
	225	+ public void setCheckTimeDesc(String checkTimeDesc) {
	226	+ this.checkTimeDesc = checkTimeDesc;
	227	+ }
	228	+
	229	+ public String getVisitHospitalId() {
	230	+ return visitHospitalId;
	231	+ }
	232	+
	233	+ public void setVisitHospitalId(String visitHospitalId) {
	234	+ this.visitHospitalId = visitHospitalId;
	235	+ }
	236	+
	237	+ public String getFeedType() {
	238	+ return feedType;
	239	+ }
	240	+
	241	+ public void setFeedType(String feedType) {
	242	+ this.feedType = feedType;
	243	+ }
	244	+
	245	+ public String getFeedNumber() {
	246	+ return feedNumber;
	247	+ }
	248	+
	249	+ public void setFeedNumber(String feedNumber) {
	250	+ this.feedNumber = feedNumber;
	251	+ }
	252	+
	253	+ public Integer getNurseNumber() {
	254	+ return nurseNumber;
	255	+ }
	256	+
	257	+ public void setNurseNumber(Integer nurseNumber) {
	258	+ this.nurseNumber = nurseNumber;
	259	+ }
	260	+
	261	+ public String getWeight() {
	262	+ return weight;
	263	+ }
	264	+
	265	+ public void setWeight(String weight) {
	266	+ this.weight = weight;
	267	+ }
	268	+
	269	+ public String getHeight() {
	270	+ return height;
	271	+ }
	272	+
	273	+ public void setHeight(String height) {
	274	+ this.height = height;
	275	+ }
	276	+
	277	+ public String getVomit() {
	278	+ return vomit;
	279	+ }
	280	+
	281	+ public void setVomit(String vomit) {
	282	+ this.vomit = vomit;
	283	+ }
	284	+
	285	+ public String getShit() {
	286	+ return shit;
	287	+ }
	288	+
	289	+ public void setShit(String shit) {
	290	+ this.shit = shit;
	291	+ }
	292	+
	293	+ public Integer getShitNumber() {
	294	+ return shitNumber;
	295	+ }
	296	+
	297	+ public void setShitNumber(Integer shitNumber) {
	298	+ this.shitNumber = shitNumber;
	299	+ }
	300	+
	301	+ public String getTemperature() {
	302	+ return temperature;
	303	+ }
	304	+
	305	+ public void setTemperature(String temperature) {
	306	+ this.temperature = temperature;
	307	+ }
	308	+
	309	+ public String getWeightNow() {
	310	+ return weightNow;
	311	+ }
	312	+
	313	+ public void setWeightNow(String weightNow) {
	314	+ this.weightNow = weightNow;
	315	+ }
	316	+
	317	+ public String getHeartRate() {
	318	+ return heartRate;
	319	+ }
	320	+
	321	+ public void setHeartRate(String heartRate) {
	322	+ this.heartRate = heartRate;
	323	+ }
	324	+
	325	+ public String getRespiratoryRate() {
	326	+ return respiratoryRate;
	327	+ }
	328	+
	329	+ public void setRespiratoryRate(String respiratoryRate) {
	330	+ this.respiratoryRate = respiratoryRate;
	331	+ }
	332	+
	333	+ public String getSkin() {
	334	+ return skin;
	335	+ }
	336	+
	337	+ public void setSkin(String skin) {
	338	+ this.skin = skin;
	339	+ }
	340	+
	341	+ public String getComplexion() {
	342	+ return complexion;
	343	+ }
	344	+
	345	+ public void setComplexion(String complexion) {
	346	+ this.complexion = complexion;
	347	+ }
	348	+
	349	+ public String getIctericPart() {
	350	+ return ictericPart;
	351	+ }
	352	+
	353	+ public void setIctericPart(String ictericPart) {
	354	+ this.ictericPart = ictericPart;
	355	+ }
	356	+
	357	+ public String getBregmatic() {
	358	+ return bregmatic;
	359	+ }
	360	+
	361	+ public void setBregmatic(String bregmatic) {
	362	+ this.bregmatic = bregmatic;
	363	+ }
	364	+
	365	+ public String getUnclosedSize() {
	366	+ return unclosedSize;
	367	+ }
	368	+
	369	+ public void setUnclosedSize(String unclosedSize) {
	370	+ this.unclosedSize = unclosedSize;
	371	+ }
	372	+
	373	+ public String getEye() {
	374	+ return eye;
	375	+ }
	376	+
	377	+ public void setEye(String eye) {
	378	+ this.eye = eye;
	379	+ }
	380	+
	381	+ public String getLimb() {
	382	+ return limb;
	383	+ }
	384	+
	385	+ public void setLimb(String limb) {
	386	+ this.limb = limb;
	387	+ }
	388	+
	389	+ public String getEar() {
	390	+ return ear;
	391	+ }
	392	+
	393	+ public void setEar(String ear) {
	394	+ this.ear = ear;
	395	+ }
	396	+
	397	+ public String getNeck() {
	398	+ return neck;
	399	+ }
	400	+
	401	+ public void setNeck(String neck) {
	402	+ this.neck = neck;
	403	+ }
	404	+
	405	+ public String getNose() {
	406	+ return nose;
	407	+ }
	408	+
	409	+ public void setNose(String nose) {
	410	+ this.nose = nose;
	411	+ }
	412	+
	413	+ public String getMouth() {
	414	+ return mouth;
	415	+ }
	416	+
	417	+ public void setMouth(String mouth) {
	418	+ this.mouth = mouth;
	419	+ }
	420	+
	421	+ public String getGangmen() {
	422	+ return gangmen;
	423	+ }
	424	+
	425	+ public void setGangmen(String gangmen) {
	426	+ this.gangmen = gangmen;
	427	+ }
	428	+
	429	+ public String getHeartLung() {
	430	+ return heartLung;
	431	+ }
	432	+
	433	+ public void setHeartLung(String heartLung) {
	434	+ this.heartLung = heartLung;
	435	+ }
	436	+
	437	+ public String getUmbilicalCord() {
	438	+ return umbilicalCord;
	439	+ }
	440	+
	441	+ public void setUmbilicalCord(String umbilicalCord) {
	442	+ this.umbilicalCord = umbilicalCord;
	443	+ }
	444	+
	445	+ public String getAbdomen() {
	446	+ return abdomen;
	447	+ }
	448	+
	449	+ public void setAbdomen(String abdomen) {
	450	+ this.abdomen = abdomen;
	451	+ }
	452	+
	453	+ public String getSpine() {
	454	+ return spine;
	455	+ }
	456	+
	457	+ public void setSpine(String spine) {
	458	+ this.spine = spine;
	459	+ }
	460	+
	461	+ public String getExtGenitalia() {
	462	+ return extGenitalia;
	463	+ }
	464	+
	465	+ public void setExtGenitalia(String extGenitalia) {
	466	+ this.extGenitalia = extGenitalia;
	467	+ }
	468	+
	469	+ public String getDiagnosis() {
	470	+ return diagnosis;
	471	+ }
	472	+
	473	+ public void setDiagnosis(String diagnosis) {
	474	+ this.diagnosis = diagnosis;
	475	+ }
	476	+
	477	+ public String getHandleOpinions() {
	478	+ return handleOpinions;
	479	+ }
	480	+
	481	+ public void setHandleOpinions(String handleOpinions) {
	482	+ this.handleOpinions = handleOpinions;
	483	+ }
	484	+
	485	+ public String getGuidanceOpinion() {
	486	+ return guidanceOpinion;
	487	+ }
	488	+
	489	+ public void setGuidanceOpinion(String guidanceOpinion) {
	490	+ this.guidanceOpinion = guidanceOpinion;
	491	+ }
	492	+
	493	+ public String getDoctor() {
	494	+ return doctor;
	495	+ }
	496	+
	497	+ public void setDoctor(String doctor) {
	498	+ this.doctor = doctor;
	499	+ }
	500	+
	501	+ public String getVisitLocation() {
	502	+ return visitLocation;
	503	+ }
	504	+
	505	+ public void setVisitLocation(String visitLocation) {
	506	+ this.visitLocation = visitLocation;
	507	+ }
	508	+
	509	+ public Date getNextVisitTime() {
	510	+ return nextVisitTime;
	511	+ }
	512	+
	513	+ public void setNextVisitTime(Date nextVisitTime) {
	514	+ this.nextVisitTime = nextVisitTime;
	515	+ }
	516	+
	517	+ public String getNextVisitTimeDesc() {
	518	+ return nextVisitTimeDesc;
	519	+ }
	520	+
	521	+ public void setNextVisitTimeDesc(String nextVisitTimeDesc) {
	522	+ this.nextVisitTimeDesc = nextVisitTimeDesc;
	523	+ }
	524	+}

...	...	@@ -138,7 +138,7 @@
138	138	}
139	139
140	140	/**
141		- * 随访模块列表管理初始化数据
	141	+ * 听力诊断列表管理初始化数据
142	142	*
143	143	* @return
144	144	*/
145	145
...	...	@@ -163,8 +163,32 @@
163	163	*/
164	164	@RequestMapping(method = RequestMethod.GET, value = "/initHearingDiagnose")
165	165	@ResponseBody
	166	+ public BaseResponse initHearingDiagnose() {
	167	+
	168	+ //根据条件查询基础配置信息表
	169	+ InitHearingDiagnose initHearingDiagnose = new InitHearingDiagnose();
	170	+ initHearingDiagnose.setConfirmResult(EnumUtil.toJson(ConfirmedEnums.class));
	171	+ initHearingDiagnose.setHearingDiagnosis(EnumUtil.toJson(HearingDiagnosisEnums.class));
	172	+ initHearingDiagnose.setHighRiskConfirms(EnumUtil.toJson(HighRiskEnum.class));
	173	+ initHearingDiagnose.setHandlingSuggestion(EnumUtil.toJson(HdEnums.HandlingSuggestionEnums.class));
	174	+ return initHearingDiagnose.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
	175	+ }
	176	+
	177	+ /**
	178	+ * 进入新增听力诊断页面前，验证及初始化数据
	179	+ *
	180	+ * @return
	181	+ */
	182	+ @RequestMapping(method = RequestMethod.GET, value = "/checkHearingDiagnose")
	183	+ @ResponseBody
166	184	@TokenRequired
167		- public BaseResponse initHearingDiagnose(String babyId, HttpServletRequest request) {
	185	+ public BaseResponse checkHearingDiagnose(String babyId, HttpServletRequest request) {
	186	+ //开发--跳过验证
	187	+ if(StringUtils.isNotEmpty(babyId)){
	188	+ //根据条件查询基础配置信息表
	189	+ InitFollowUp aa = new InitFollowUp();
	190	+ return aa.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
	191	+ }
168	192	//获取当前登录用户ID
169	193	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
170	194	if (loginState == null) {
...	...	@@ -197,11 +221,11 @@
197	221	if(scr.getOaeRight()==null\|\|scr.getOaeLeft()==null\|\|scr.getAabrLeft()==null\|\|scr.getAabrRight()==null){
198	222
199	223	}else
200		- //只要有听筛未通过的就可以进入听诊了
201		- if (scr.getOaeLeft() == -1 \|\| scr.getOaeRight() == -1 \|\| scr.getAabrLeft() == -1 \|\| scr.getAabrRight() == -1) {//1=通过 -1=未通过
202		- isResu = true;
203		- break;
204		- }
	224	+ //只要有听筛未通过的就可以进入听诊了
	225	+ if (scr.getOaeLeft() == -1 \|\| scr.getOaeRight() == -1 \|\| scr.getAabrLeft() == -1 \|\| scr.getAabrRight() == -1) {//1=通过 -1=未通过
	226	+ isResu = true;
	227	+ break;
	228	+ }
205	229	}
206	230	if (!isResu) {
207	231	return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_POWER).setErrormsg("该儿童还未听筛未通过记录不能进行听诊");

...	...	@@ -317,12 +317,15 @@
317	317	}
318	318
319	319	scrQuery.setCheckHospitalIds((String[]) outOrgids.toArray(new String[outOrgids.size()]));
	320	+ if(scrQuery.getCheckHospitalIds()==null\|\|scrQuery.getCheckHospitalIds().length==0){
	321	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
	322	+ }
320	323
321	324	//主数据
322	325	List<String> babyIds = screenService.queryScrBabyIds(scrQuery);
323	326
324	327	if (babyIds.size() == 0) {
325		- return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有找到数据");
	328	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("没有找到数据");
326	329	}
327	330
328	331	//设置要显示的医院集合（已加入条件本院、外院、全部）
...	...	@@ -407,6 +410,9 @@
407	410	hd.setBabyId(babyIds.get(i));
408	411	int index1 = Collections.binarySearch(hearingDiagnoseList, hd, new MyComparator());
409	412	HearingDiagnoseListResult hea = new HearingDiagnoseListResult();
	413	+ if (index1 < 0) {
	414	+ continue;
	415	+ }
410	416	if (index1 >= 0) {
411	417	hd = hearingDiagnoseList.get(index1);
412	418	hea.setIsconfirm(hd.getIsconfirm() == null ? "未确诊" : hd.getIsconfirm() == 0 ? "未确诊" : "已确诊");
413	419
414	420
415	421
416	422
417	423
...	...	@@ -420,30 +426,36 @@
420	426	hea.setHdTime(com.lyms.platform.common.utils.StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(hd.getDiagnoseTime())));
421	427	if (hd.getHighFactor() != null) {
422	428	String hf[] = hd.getHighFactor().split(",");
423		- List<Map<Integer, String>> highRiskEnums = new ArrayList<>();
	429	+ // List<Map<Integer, String>> highRiskEnums = new ArrayList<>();
	430	+ StringBuffer hrSb = new StringBuffer();
424	431	for (int b = 0; b < hf.length; b++) {
425	432	if (StringUtils.isNotEmpty(hf[b])) {
426	433	Map<Integer, String> map = new HashMap<>();
427	434	String title = HighRiskEnum.getTitle(Integer.parseInt(hf[b]));
428	435	map.put(Integer.parseInt(hf[b]), title);
429		- highRiskEnums.add(map);
	436	+ // highRiskEnums.add(map);
	437	+ hrSb.append(title+",");
430	438	}
431	439	}
432		- hea.setHighRiskEnums(highRiskEnums);
	440	+ // hea.setHighRiskEnums(highRiskEnums);
	441	+ hea.setHighRiskEnums(hrSb.toString());
433	442	}
434	443	//确诊结果
435	444	if (hd.getConfirmResult() != null) {
436	445	String cr[] = hd.getConfirmResult().split(",");
437		- List<Map<Integer, String>> hdEnums = new ArrayList<>();
	446	+ // List<Map<Integer, String>> hdEnums = new ArrayList<>();
	447	+ StringBuffer hdSb = new StringBuffer();
438	448	for (int b = 0; b < cr.length; b++) {
439	449	if (StringUtils.isNotEmpty(cr[b])) {
440	450	Map<Integer, String> map = new HashMap<>();
441	451	String title = ConfirmedEnums.getTitle(Integer.parseInt(cr[b]));
442	452	map.put(Integer.parseInt(cr[b]), title);
443		- hdEnums.add(map);
	453	+ // hdEnums.add(map);
	454	+ hdSb.append(title+"，");
444	455	}
445	456	}
446		- hea.setDiagnResult(hdEnums);
	457	+ // hea.setDiagnResult(hdEnums);
	458	+ hea.setDiagnResult(hdSb.toString());
447	459	}
448	460	}
449	461	BabyModel babyModel = babyService.getOneBabyById(hd.getBabyId());
...	...	@@ -556,6 +568,7 @@
556	568	*/
557	569	@RequestMapping(method = RequestMethod.POST, value = "/editHearingDiagnose")
558	570	@ResponseBody
	571	+ @TokenRequired
559	572	public BaseResponse editHearingDiagnose(BabyPatientExtendEarHearingDiagnose obj, HttpServletRequest request) {
560	573	if (StringUtils.isEmpty(obj.getId())) {
561	574	return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入要修改的听力诊断id");
...	...	@@ -588,6 +601,7 @@
588	601	*/
589	602	@RequestMapping(method = RequestMethod.POST, value = "/saveHearingDiagnose")
590	603	@ResponseBody
	604	+ @TokenRequired
591	605	public BaseResponse addHearingDiagnose(BabyPatientExtendEarHearingDiagnose obj,
592	606	HttpServletRequest request) {
593	607	//获取当前登录用户ID
...	...	@@ -613,6 +627,7 @@
613	627	obj.setCreateId(String.valueOf(loginState.getId()));
614	628	obj.setHospitalId(hospitalId);
615	629	obj.setEnalble(1);
	630	+ obj.setId(UUID.randomUUID().toString().replace("-", ""));
616	631	hearingDiagnoseService.addBabyPatientExtendEarHearingDiagnose(obj);
617	632
618	633	//根据babyId和当前医院id获取是否有转诊记录

	1	+package com.lyms.platform.operate.web.controller;
	2	+
	3	+import com.lyms.platform.common.annotation.TokenRequired;
	4	+import com.lyms.platform.common.base.BaseController;
	5	+import com.lyms.platform.common.result.BaseObjectResponse;
	6	+import com.lyms.platform.operate.web.service.INewbornVisitService;
	7	+import com.lyms.platform.pojo.NewbornVisit;
	8	+import org.springframework.beans.factory.annotation.Autowired;
	9	+import org.springframework.stereotype.Controller;
	10	+import org.springframework.web.bind.annotation.RequestMapping;
	11	+import org.springframework.web.bind.annotation.RequestMethod;
	12	+import org.springframework.web.bind.annotation.ResponseBody;
	13	+
	14	+import javax.servlet.http.HttpServletRequest;
	15	+import javax.servlet.http.HttpServletResponse;
	16	+import java.util.Date;
	17	+
	18	+/**
	19	+ * 新生儿访视
	20	+ * Created by lt on 2017/7/18 0018
	21	+ */
	22	+@Controller
	23	+@RequestMapping("/newborn")
	24	+public class NewbornVisitControoler extends BaseController {
	25	+
	26	+ @Autowired
	27	+ private INewbornVisitService visitService;
	28	+
	29	+ @RequestMapping(method = RequestMethod.POST)
	30	+ @ResponseBody
	31	+ @TokenRequired
	32	+ public BaseObjectResponse add(HttpServletRequest request, NewbornVisit newbornVisit) {
	33	+ return visitService.addOrUpdate(getUserId(request), newbornVisit);
	34	+ }
	35	+
	36	+ /**
	37	+ * 新生儿访视管理
	38	+ * @param startDate 访视开始日期
	39	+ * @param endDate 访视结束日期
	40	+ * @param doctor 访视医生
	41	+ * @param key 儿童姓名(模糊查询)/母亲联系方式/母亲证件号
	42	+ * @return
	43	+ */
	44	+ @RequestMapping(method = RequestMethod.GET)
	45	+ @ResponseBody
	46	+ @TokenRequired
	47	+ public BaseObjectResponse list(HttpServletRequest request, Date startDate, Date endDate, String doctor, String key, Integer page, Integer limit) {
	48	+ return visitService.list(startDate, endDate, doctor, getUserId(request), key, page, limit);
	49	+ }
	50	+
	51	+ /**
	52	+ * 新生儿访视查询
	53	+ * @param pid
	54	+ * @return
	55	+ */
	56	+ @RequestMapping(value = "/query", method = RequestMethod.GET)
	57	+ @ResponseBody
	58	+ @TokenRequired
	59	+ public BaseObjectResponse query(HttpServletRequest request, String pid) {
	60	+ return visitService.query(getUserId(request), pid);
	61	+ }
	62	+
	63	+ /**
	64	+ * 新生儿访视导出
	65	+ * @param startDate 访视开始日期
	66	+ * @param endDate 访视结束日期
	67	+ * @param doctor 访视医生
	68	+ * @param key 儿童姓名(模糊查询)/母亲联系方式/母亲证件号
	69	+ * @return
	70	+ */
	71	+ @RequestMapping(value = "/export", method = RequestMethod.GET)
	72	+ public void export(HttpServletRequest request, HttpServletResponse response, Date startDate, Date endDate, String doctor, String key, Integer page, Integer limit) {
	73	+ visitService.export(startDate, endDate, doctor, getUserId(request), response, key);
	74	+ }
	75	+
	76	+ @RequestMapping(value = "/init", method = RequestMethod.GET)
	77	+ @ResponseBody
	78	+ public BaseObjectResponse init() {
	79	+ return visitService.init();
	80	+ }
	81	+}

...	...	@@ -653,16 +653,16 @@
653	653	List<Patients> list = patientsService.queryPatient(patientsQuery);
654	654	if (CollectionUtils.isNotEmpty(list)) {
655	655	HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), model.getBirth());
656		- List<String> listHighRisk = res.getHighRisk();
	656	+ List<Map> listHighRisk = res.getHighRisk();
657	657
658	658	if (CollectionUtils.isNotEmpty(listHighRisk)) {
659		- if (listHighRisk.contains("健康")) {
	659	+ if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) {
660	660	base.setHighRisk("健康");
661	661	} else {
662	662	base.setHighRisk("高危");
663	663	}
664	664	} else {
665		- base.setHighRisk("健康");
	665	+ base.setHighRisk("");
666	666	}
667	667	}
668	668

...	...	@@ -1333,12 +1333,54 @@
1333	1333
1334	1334	map.put("heart", data.getHeart());
1335	1335	map.put("lungs", data.getLungs());
1336		- map.put("vulva", data.getVulva());
1337		- map.put("vagina", data.getVagina());
1338		- map.put("cervical", data.getCervical());
1339		- map.put("uterus", data.getUterus());
1340		- map.put("fujian", data.getFujian());
1341	1336
	1337	+
	1338	+ if(StringUtils.isNotEmpty(data.getVulvaSele())){
	1339	+ if("2".equals(data.getVulvaSele())){
	1340	+ map.put("vulvaSele", "未见异常");
	1341	+ }else if("1".equals(data.getVulvaSele())){
	1342	+ map.put("vulva", data.getVulva());
	1343	+ }
	1344	+ }else{//空
	1345	+ map.put("vulva", data.getVulva());
	1346	+ }
	1347	+ if(StringUtils.isNotEmpty(data.getVaginaSele())){
	1348	+ if("2".equals(data.getVaginaSele())){
	1349	+ map.put("vaginaSele", "未见异常");
	1350	+ }else if("1".equals(data.getVaginaSele())){
	1351	+ map.put("vagina", data.getVagina());
	1352	+ }
	1353	+ }else{//空
	1354	+ map.put("vagina", data.getVagina());
	1355	+ }
	1356	+ if(StringUtils.isNotEmpty(data.getCervicalSele())){
	1357	+ if("2".equals(data.getCervicalSele())){
	1358	+ map.put("cervicalSele", "未见异常");
	1359	+ }else if("1".equals(data.getCervicalSele())){
	1360	+ map.put("cervical", data.getCervical());
	1361	+ }
	1362	+ }else{//空
	1363	+ map.put("cervical", data.getCervical());
	1364	+ }
	1365	+ if(StringUtils.isNotEmpty(data.getUterusSele())){
	1366	+ if("2".equals(data.getUterusSele())){
	1367	+ map.put("uterusSele", "未见异常");
	1368	+ }else if("1".equals(data.getUterusSele())){
	1369	+ map.put("uterus", data.getUterus());
	1370	+ }
	1371	+ }else{//空
	1372	+ map.put("uterus", data.getUterus());
	1373	+ }
	1374	+ if(StringUtils.isNotEmpty(data.getFujianSele())){
	1375	+ if("1".equals(data.getFujianSele())){
	1376	+ map.put("fujian", data.getFujian());
	1377	+ }else if("2".equals(data.getFujianSele())){
	1378	+ map.put("fujianSele", "未见异常");
	1379	+ }
	1380	+ }else{//空
	1381	+ map.put("fujian", data.getFujian());
	1382	+ }
	1383	+
1342	1384	map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM));
1343	1385
1344	1386	if (StringUtils.isNotEmpty(data.getGonggaoSelect())) {
1345	1387
1346	1388
...	...	@@ -2660,16 +2702,16 @@
2660	2702	List<Patients> list = patientsService.queryPatient(patientsQuery);
2661	2703	if (CollectionUtils.isNotEmpty(list)) {
2662	2704	HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), model.getBirth());
2663		- List<String> listHighRisk = res.getHighRisk();
	2705	+ List<Map> listHighRisk = res.getHighRisk();
2664	2706
2665	2707	if (CollectionUtils.isNotEmpty(listHighRisk)) {
2666		- if (listHighRisk.contains("健康")) {
	2708	+ if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) {
2667	2709	result.setMommyHighRiskReason("健康");
2668	2710	} else {
2669	2711	result.setMommyHighRiskReason("高危");
2670	2712	}
2671	2713	} else {
2672		- result.setMommyHighRiskReason("健康");
	2714	+ result.setMommyHighRiskReason("");
2673	2715	}
2674	2716	}
2675	2717
2676	2718
2677	2719
...	...	@@ -2809,16 +2851,16 @@
2809	2851	List<Patients> list = patientsService.queryPatient(patientsQuery);
2810	2852	if (CollectionUtils.isNotEmpty(list)) {
2811	2853	HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), babyModel.getBirth());
2812		- List<String> listHighRisk = res.getHighRisk();
	2854	+ List<Map> listHighRisk = res.getHighRisk();
2813	2855
2814	2856	if (CollectionUtils.isNotEmpty(listHighRisk)) {
2815		- if (listHighRisk.contains("健康")) {
	2857	+ if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) {
2816	2858	model.setMommyHighRisk("健康");
2817	2859	} else {
2818	2860	model.setMommyHighRisk("高危");
2819	2861	}
2820	2862	} else {
2821		- model.setMommyHighRisk("健康");
	2863	+ model.setMommyHighRisk("");
2822	2864	}
2823	2865	}
2824	2866

...	...	@@ -88,14 +88,24 @@
88	88	private String lungs;
89	89	//外阴
90	90	private String vulva;
	91	+ //外阴选项
	92	+ private String vulvaSele;
91	93	//阴道
92	94	private String vagina;
	95	+ //阴道选项
	96	+ private String vaginaSele;
93	97	// 宫颈
94	98	private String cervical;
	99	+ // 宫颈选项
	100	+ private String cervicalSele;
95	101	//子宫
96	102	private String uterus;
	103	+ //子宫选项
	104	+ private String uterusSele;
97	105	//附件
98	106	private String fujian;
	107	+ //附件选项
	108	+ private String fujianSele;
99	109	// 宫高
100	110	private String gonggao;
101	111	// 宫高选项
...	...	@@ -333,6 +343,46 @@
333	343	//传染病史
334	344	private Map infectDiseases;
335	345
	346	+ public String getVulvaSele() {
	347	+ return vulvaSele;
	348	+ }
	349	+
	350	+ public void setVulvaSele(String vulvaSele) {
	351	+ this.vulvaSele = vulvaSele;
	352	+ }
	353	+
	354	+ public String getVaginaSele() {
	355	+ return vaginaSele;
	356	+ }
	357	+
	358	+ public void setVaginaSele(String vaginaSele) {
	359	+ this.vaginaSele = vaginaSele;
	360	+ }
	361	+
	362	+ public String getCervicalSele() {
	363	+ return cervicalSele;
	364	+ }
	365	+
	366	+ public void setCervicalSele(String cervicalSele) {
	367	+ this.cervicalSele = cervicalSele;
	368	+ }
	369	+
	370	+ public String getUterusSele() {
	371	+ return uterusSele;
	372	+ }
	373	+
	374	+ public void setUterusSele(String uterusSele) {
	375	+ this.uterusSele = uterusSele;
	376	+ }
	377	+
	378	+ public String getFujianSele() {
	379	+ return fujianSele;
	380	+ }
	381	+
	382	+ public void setFujianSele(String fujianSele) {
	383	+ this.fujianSele = fujianSele;
	384	+ }
	385	+
336	386	public String getSyjgSelect() {
337	387	return syjgSelect;
338	388	}
...	...	@@ -1171,6 +1221,11 @@
1171	1221	antExChuModel.setFitness(fitness);
1172	1222	antExChuModel.setFitnessRemark(fitnessRemark);
1173	1223
	1224	+ antExChuModel.setVulvaSele(vulvaSele);
	1225	+ antExChuModel.setVaginaSele(vaginaSele);
	1226	+ antExChuModel.setCervicalSele(cervicalSele);
	1227	+ antExChuModel.setUterusSele(uterusSele);
	1228	+ antExChuModel.setFujianSele(fujianSele);
1174	1229	antExChuModel.setYinchan(yinchan);
1175	1230	antExChuModel.setGongwaiyun(gongwaiyun);
1176	1231	antExChuModel.setYaowu(yaowu);

...	...	@@ -141,14 +141,24 @@
141	141	private String lungs;
142	142	//外阴
143	143	private String vulva;
	144	+ //外阴选项
	145	+ private String vulvaSele;
144	146	//阴道
145	147	private String vagina;
	148	+ //阴道选项
	149	+ private String vaginaSele;
146	150	// 宫颈
147	151	private String cervical;
	152	+ // 宫颈选项
	153	+ private String cervicalSele;
148	154	//子宫
149	155	private String uterus;
	156	+ //子宫选项
	157	+ private String uterusSele;
150	158	//附件
151	159	private String fujian;
	160	+ //附件选项
	161	+ private String fujianSele;
152	162
153	163	private Map bp;
154	164
155	165
156	166
...	...	@@ -744,8 +754,46 @@
744	754	this.placentas = placentas;
745	755	}
746	756
	757	+ public String getVulvaSele() {
	758	+ return vulvaSele;
	759	+ }
747	760
	761	+ public void setVulvaSele(String vulvaSele) {
	762	+ this.vulvaSele = vulvaSele;
	763	+ }
748	764
	765	+ public String getVaginaSele() {
	766	+ return vaginaSele;
	767	+ }
	768	+
	769	+ public void setVaginaSele(String vaginaSele) {
	770	+ this.vaginaSele = vaginaSele;
	771	+ }
	772	+
	773	+ public String getCervicalSele() {
	774	+ return cervicalSele;
	775	+ }
	776	+
	777	+ public void setCervicalSele(String cervicalSele) {
	778	+ this.cervicalSele = cervicalSele;
	779	+ }
	780	+
	781	+ public String getUterusSele() {
	782	+ return uterusSele;
	783	+ }
	784	+
	785	+ public void setUterusSele(String uterusSele) {
	786	+ this.uterusSele = uterusSele;
	787	+ }
	788	+
	789	+ public String getFujianSele() {
	790	+ return fujianSele;
	791	+ }
	792	+
	793	+ public void setFujianSele(String fujianSele) {
	794	+ this.fujianSele = fujianSele;
	795	+ }
	796	+
749	797	public String getPlatelet() {
750	798	return platelet;
751	799	}
...	...	@@ -1179,6 +1227,11 @@
1179	1227	setParentId(antExChuModel.getParentId());
1180	1228	setGongGaoSelect(antExChuModel.getGonggaoSelect());
1181	1229	setGongGaoType(antExChuModel.getGonggaoType());
	1230	+ setVulvaSele(antExChuModel.getVulvaSele());
	1231	+ setVaginaSele(antExChuModel.getVaginaSele());
	1232	+ setCervicalSele(antExChuModel.getCervicalSele());
	1233	+ setUterusSele(antExChuModel.getUterusSele());
	1234	+ setFujianSele(antExChuModel.getFujianSele());
1182	1235	// //早孕期病毒检测
1183	1236	// private String zyqbdjc;
1184	1237	// //nt检查

1	1	package com.lyms.platform.operate.web.result;
2	2
3		-import java.util.List;
4		-import java.util.Map;
5		-
6	3	/**
7	4	* 听力诊断列表
8	5	* Created by yf on 2017/5/11.
...	...	@@ -23,7 +20,7 @@
23	20	//性别
24	21	private String sex;
25	22	//诊断结果
26		- private List<Map<Integer,String>> diagnResult;
	23	+ private String diagnResult;
27	24	//是否确诊 0-待确诊，1-确诊
28	25	private String isconfirm;
29	26	//创建时间
30	27
...	...	@@ -35,16 +32,8 @@
35	32	//母亲加密联系方式
36	33	private String mommnyEncryptPhone;
37	34	//听力高危集合
38		- private List<Map<Integer,String>> highRiskEnums;
	35	+ private String highRiskEnums;
39	36
40		- public List<Map<Integer, String>> getHighRiskEnums() {
41		- return highRiskEnums;
42		- }
43		-
44		- public void setHighRiskEnums(List<Map<Integer, String>> highRiskEnums) {
45		- this.highRiskEnums = highRiskEnums;
46		- }
47		-
48	37	public String getId() {
49	38	return id;
50	39	}
...	...	@@ -81,6 +70,18 @@
81	70	return birthday;
82	71	}
83	72
	73	+ public void setDiagnResult(String diagnResult) {
	74	+ this.diagnResult = diagnResult;
	75	+ }
	76	+
	77	+ public String getHighRiskEnums() {
	78	+ return highRiskEnums;
	79	+ }
	80	+
	81	+ public void setHighRiskEnums(String highRiskEnums) {
	82	+ this.highRiskEnums = highRiskEnums;
	83	+ }
	84	+
84	85	public void setBirthday(String birthday) {
85	86	this.birthday = birthday;
86	87	}
87	88
...	...	@@ -101,17 +102,12 @@
101	102	this.sex = sex;
102	103	}
103	104
104		-
105		- public List<Map<Integer, String>> getDiagnResult() {
106		- return diagnResult;
107		- }
108		-
109		- public void setDiagnResult(List<Map<Integer, String>> diagnResult) {
110		- this.diagnResult = diagnResult;
111		- }
112		-
113	105	public String getIsconfirm() {
114	106	return isconfirm;
	107	+ }
	108	+
	109	+ public String getDiagnResult() {
	110	+ return diagnResult;
115	111	}
116	112
117	113	public void setIsconfirm(String isconfirm) {

...	...	@@ -17,6 +17,16 @@
17	17	private List<Map<String,Object>> hearingDiagnosis;
18	18	//确诊结果
19	19	private List<Map<String,Object>> confirmResult;
	20	+ //处理意见
	21	+ private List<Map<String,Object>> handlingSuggestion;
	22	+
	23	+ public List<Map<String, Object>> getHandlingSuggestion() {
	24	+ return handlingSuggestion;
	25	+ }
	26	+
	27	+ public void setHandlingSuggestion(List<Map<String, Object>> handlingSuggestion) {
	28	+ this.handlingSuggestion = handlingSuggestion;
	29	+ }
20	30
21	31	public List<Map<String, Object>> getHighRiskConfirms() {
22	32	return highRiskConfirms;

	1	+package com.lyms.platform.operate.web.service;
	2	+
	3	+import com.lyms.platform.common.result.BaseObjectResponse;
	4	+import com.lyms.platform.pojo.NewbornVisit;
	5	+
	6	+import javax.servlet.http.HttpServletResponse;
	7	+import java.util.Date;
	8	+
	9	+public interface INewbornVisitService extends IBaseService {
	10	+
	11	+ BaseObjectResponse init();
	12	+
	13	+ BaseObjectResponse addOrUpdate(Integer userId, NewbornVisit newbornVisit);
	14	+
	15	+ BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit);
	16	+
	17	+ void export(Date startDate, Date endDate, String doctor, Integer userId, HttpServletResponse response, String key);
	18	+
	19	+ BaseObjectResponse query(Integer userId, String pid);
	20	+}

	1	+package com.lyms.platform.operate.web.service.impl;
	2	+
	3	+import com.lyms.platform.biz.service.DataPermissionService;
	4	+import com.lyms.platform.common.enums.*;
	5	+import com.lyms.platform.common.result.BaseObjectResponse;
	6	+import com.lyms.platform.common.result.PageResult;
	7	+import com.lyms.platform.common.result.RespBuilder;
	8	+import com.lyms.platform.common.result.ResponseCode;
	9	+import com.lyms.platform.common.utils.DateUtil;
	10	+import com.lyms.platform.common.utils.EnumUtil;
	11	+import com.lyms.platform.common.utils.MongoConvertHelper;
	12	+import com.lyms.platform.common.utils.ReflectionUtils;
	13	+import com.lyms.platform.operate.web.facade.AutoMatchFacade;
	14	+import com.lyms.platform.operate.web.service.INewbornVisitService;
	15	+import com.lyms.platform.operate.web.utils.CollectionUtils;
	16	+import com.lyms.platform.operate.web.utils.MongoUtil;
	17	+import com.lyms.platform.operate.web.utils.ResponseUtil;
	18	+import com.lyms.platform.permission.dao.slave.UsersMapper;
	19	+import com.lyms.platform.permission.model.Users;
	20	+import com.lyms.platform.pojo.*;
	21	+import com.lyms.platform.query.DataPermissionsModelQuery;
	22	+import org.apache.commons.lang.StringUtils;
	23	+import org.springframework.beans.factory.annotation.Autowired;
	24	+import org.springframework.data.domain.Sort;
	25	+import org.springframework.data.mongodb.core.MongoTemplate;
	26	+import org.springframework.data.mongodb.core.query.Criteria;
	27	+import org.springframework.data.mongodb.core.query.Query;
	28	+import org.springframework.data.mongodb.core.query.Update;
	29	+import org.springframework.stereotype.Service;
	30	+import org.springframework.util.Assert;
	31	+
	32	+import javax.servlet.http.HttpServletResponse;
	33	+import java.util.*;
	34	+
	35	+/**
	36	+ * @Author: litao
	37	+ * @Date: 2017/4/19 0019 17:54
	38	+ * @Version: V1.0
	39	+ */
	40	+@Service
	41	+public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisitService {
	42	+
	43	+ @Autowired
	44	+ private MongoTemplate mongoTemplate;
	45	+
	46	+ @Autowired
	47	+ private DataPermissionService dataPermissionService;
	48	+
	49	+ @Autowired
	50	+ private AutoMatchFacade autoMatchFacade;
	51	+
	52	+ @Autowired
	53	+ private MongoUtil mongoUtil;
	54	+
	55	+// @Autowired
	56	+ private UsersMapper usersMapper;
	57	+
	58	+ @Override
	59	+ public BaseObjectResponse init() {
	60	+ List<Map<String, Object>> feedType = EnumUtil.toJson(FeedTypeEnums.class);
	61	+ List<Map<String, Object>> skin = EnumUtil.toJson(SkinEnums.class);
	62	+ List<Map<String, Object>> complexion = EnumUtil.toJson(ComplexionEnums.class);
	63	+ List<Map<String, Object>> bregmatic = EnumUtil.toJson(BregmaticEnums.class);
	64	+ List<Map<String, Object>> umbilicalCord = EnumUtil.toJson(UmbilicalCordEnums.class);
	65	+ List<Map<String, Object>> nextVisitTime = EnumUtil.toJson(NextVisitTimeEnums.class);
	66	+ List<Map<String, Object>> vomit = EnumUtil.toJson(VomitEnums.class);
	67	+ return RespBuilder.buildSuccess("feedType", feedType, "skin", skin, "complexion", complexion
	68	+ , "bregmatic", bregmatic, "umbilicalCord", umbilicalCord, "nextVisitTime", nextVisitTime, "vomit", vomit);
	69	+ }
	70	+
	71	+ @Override
	72	+ public BaseObjectResponse addOrUpdate(Integer userId, NewbornVisit newbornVisit) {
	73	+ newbornVisit.setFeedType(newbornVisit.getFeedType() == null ? null : FeedTypeEnums.get(Integer.parseInt(newbornVisit.getFeedType())).getName());
	74	+ newbornVisit.setSkin(newbornVisit.getSkin() == null ? null : SkinEnums.get(Integer.parseInt(newbornVisit.getSkin())).getName());
	75	+ newbornVisit.setComplexion(newbornVisit.getComplexion() == null ? null : BregmaticEnums.get(Integer.parseInt(newbornVisit.getComplexion())).getName());
	76	+ newbornVisit.setUmbilicalCord(newbornVisit.getUmbilicalCord() == null ? null : UmbilicalCordEnums.get(Integer.parseInt(newbornVisit.getUmbilicalCord())).getName());
	77	+ newbornVisit.setHospitalId(autoMatchFacade.getHospitalId(userId));
	78	+ // newbornVisit.setNextVisitTime(newbornVisit.getUmbilicalCord() == null ? null : UmbilicalCordEnums.get(Integer.parseInt(newbornVisit.getUmbilicalCord())).getName());
	79	+ if(StringUtils.isEmpty(newbornVisit.getId())) {
	80	+ String babyId = null;
	81	+ if(!buildArchive(userId, newbornVisit.getPid(), babyId)) {
	82	+ return RespBuilder.buildSuccess(ResponseCode.NEED_BUILD);
	83	+ }
	84	+ newbornVisit.setBabyId(babyId);
	85	+ newbornVisit.setId(UUID.randomUUID().toString().replace("-", ""));
	86	+ newbornVisit.setOperationId(userId.toString());
	87	+ newbornVisit.setCreated(new Date());
	88	+ newbornVisit.setYn("1");
	89	+ mongoTemplate.save(newbornVisit);
	90	+ } else {
	91	+ newbornVisit.setId(UUID.randomUUID().toString().replace("-", ""));
	92	+ newbornVisit.setOperationId(userId.toString());
	93	+ newbornVisit.setCreated(new Date());
	94	+ newbornVisit.setYn("1");
	95	+ Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(newbornVisit));
	96	+ mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(newbornVisit.getId())), update, NewbornVisit.class);
	97	+
	98	+ }
	99	+ return RespBuilder.buildSuccess();
	100	+ }
	101	+
	102	+ /**
	103	+ * 隐藏建档
	104	+ * @param userId
	105	+ * @return
	106	+ */
	107	+ private boolean buildArchive(Integer userId, String pid, String babyId) {
	108	+ Assert.notNull(pid, "pid 不能为null");
	109	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	110	+ // 如果本院已有记录直接走正常流程
	111	+ BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class);
	112	+ if(baby != null) {
	113	+ babyId = baby.getId();
	114	+ return true;
	115	+ }
	116	+
	117	+ DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
	118	+ dataPermissionsModelQuery.setUserId(userId);
	119	+ List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);
	120	+ if (CollectionUtils.isNotEmpty(permissionsModels)) {
	121	+ Set<String> set = permissionsModels.get(0).getData().keySet();
	122	+ Iterator<String> it = set.iterator();
	123	+ BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("hospitalId").in(set)
	124	+ .and("pid").is(pid)).with(new Sort(Sort.Direction.DESC, "created")), BabyModel.class);
	125	+ if(babyModel == null) {
	126	+ return false; // 需要建档
	127	+ }
	128	+ babyId = UUID.randomUUID().toString().replace("-", "");
	129	+ babyModel.setId(babyId);
	130	+ babyModel.setHospitalId(hospitalId);
	131	+ babyModel.setEnable("2");
	132	+ babyModel.setCreated(new Date());
	133	+ mongoTemplate.save(babyModel);
	134	+ return true;
	135	+ }
	136	+ return false;
	137	+ }
	138	+
	139	+ @Override
	140	+ public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) {
	141	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	142	+ Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
	143	+ if(startDate != null && endDate != null) {
	144	+ criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1));
	145	+ }
	146	+ if(StringUtils.isNotBlank(doctor)) {
	147	+ criteria.and("doctor").is(doctor);
	148	+ }
	149	+ PageResult pageResult = findMongoPage(NewbornVisit.class, new Query(criteria), page, limit);
	150	+ List<NewbornVisit> newbornVisits = (List<NewbornVisit>) pageResult.getGrid();
	151	+ List<Map<String, Object>> restMap = new ArrayList<>();
	152	+ for (NewbornVisit visit : newbornVisits) {
	153	+ Map<String, Object> temp = new HashMap<>();
	154	+
	155	+ temp.put("checkTime", visit.getCheckTime() == null ? null : DateUtil.getyyyy_MM_dd(visit.getCheckTime())); // 复查访视时间
	156	+ String pid = visit.getPid();
	157	+ if(StringUtils.isNotBlank(pid)) {
	158	+ PersonModel person = mongoTemplate.findById(pid, PersonModel.class);
	159	+ if(person != null) {
	160	+ temp.put("cardNo", person.getCardNo());
	161	+ temp.put("name", person.getName());
	162	+ temp.put("age", DateUtil.getAge(person.getBirth()));
	163	+ temp.put("phone", person.getPhone());
	164	+ }
	165	+ Patients patients = mongoTemplate.findById(visit.getParentId(), Patients.class);
	166	+ if(patients != null) {
	167	+ int days = DateUtil.daysBetween(patients.getFmDate(), new Date());
	168	+ temp.put("days", "产后"+days+"天");
	169	+ }
	170	+ temp.put("count", mongoTemplate.count(new Query(criteria), NewbornVisit.class));
	171	+ temp.put("benyuan", mongoTemplate.count(new Query(criteria.and("visitHositalId").is(hospitalId)), NewbornVisit.class));
	172	+ Users users = usersMapper.getUsers(Integer.parseInt(visit.getDoctor()));
	173	+ temp.put("doctorName", users == null ? null : users.getName());
	174	+ }
	175	+
	176	+ }
	177	+ return RespBuilder.buildSuccess(newbornVisits);
	178	+ }
	179	+
	180	+ @Override
	181	+ public void export(Date startDate, Date endDate, String doctor, Integer userId, HttpServletResponse response, String key) {
	182	+ BaseObjectResponse rest = list(startDate, endDate, doctor, userId, key, 1, Integer.MAX_VALUE);
	183	+ PageResult pageResult = (PageResult) rest.getData();
	184	+ List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
	185	+ Map<String, String> cnames = new LinkedHashMap<>();
	186	+// Map<String, String> cnames = new LinkedHashMap<>();
	187	+ cnames.put("id", "#");
	188	+ cnames.put("checkTime", "复查访视日期");
	189	+ cnames.put("cardNo", "证件号");
	190	+ cnames.put("name", "姓名");
	191	+ cnames.put("age", "年龄");
	192	+ cnames.put("day", "产后天数");
	193	+ cnames.put("count", "访视次数");
	194	+ cnames.put("benyuan", "本院访视次数");
	195	+ cnames.put("doctorName", "访视医生");
	196	+ cnames.put("phone", "联系电话");
	197	+
	198	+ List<Map<String,Object>> results = new ArrayList<>();
	199	+ if(org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) {
	200	+ int i = 0;
	201	+ for (Map<String, Object> data : datas) {
	202	+ Map<String, Object> result = new LinkedHashMap<>();
	203	+ result.put("id", ++i);
	204	+ result.put("checkTime", data.get("checkTime"));
	205	+ result.put("cardNo", data.get("cardNo"));
	206	+ result.put("name", data.get("name"));
	207	+ result.put("age", data.get("age"));
	208	+ result.put("day", data.get("day"));
	209	+ result.put("count", data.get("count"));
	210	+ result.put("benyuan", data.get("benyuan"));
	211	+ result.put("doctorName", data.get("doctorName"));
	212	+ result.put("phone", data.get("phone"));
	213	+ results.add(result);
	214	+ }
	215	+ }
	216	+
	217	+ ResponseUtil.responseExcel(cnames, results, response);
	218	+ }
	219	+
	220	+ @Override
	221	+ public BaseObjectResponse query(Integer userId, String pid) {
	222	+ String hospitalId = autoMatchFacade.getHospitalId(userId);
	223	+ List<NewbornVisit> newbornVisits = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId))
	224	+ .with(new Sort(Sort.Direction.ASC, "checkTime")), NewbornVisit.class);
	225	+ List<Map<String, Object>> rest = new ArrayList<>();
	226	+ for (NewbornVisit newbornVisit : newbornVisits) {
	227	+ Map<String, Object> temp = new HashMap<>();
	228	+ temp.put("pid", newbornVisit.getPid());
	229	+ temp.put("checkTime", newbornVisit.getCheckTime() == null ? null : DateUtil.getyyyy_MM_dd(newbornVisit.getCheckTime()));
	230	+ temp.put("checkTimeDesc", newbornVisit.getCheckTimeDesc());
	231	+ rest.add(temp);
	232	+ }
	233	+ return RespBuilder.buildSuccess(rest);
	234	+ }
	235	+
	236	+}

...	...	@@ -202,6 +202,5 @@
202	202	Assert.notNull(id, "id不能为空");
203	203	return mongoTemplate.findById(id, BasicConfig.class);
204	204	}
205		-
206	205	}

...	...	@@ -2,13 +2,13 @@
2	2	<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
3	3
4	4	<classpath>
5		- <dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/target/classes">
	5	+ <dir name="D:/lyms_work/regional-platform/platform-operate-api/target/classes">
6	6	</dir>
7	7	</classpath>
8	8
9	9	<web>
10	10	<link target="/">
11		- <dir name="D:/lyms_wrok/regional/regional-platform/platform-operate-api/src/main/webapp">
	11	+ <dir name="D:/lyms_work/regional-platform/platform-operate-api/src/main/webapp">
12	12	</dir>
13	13	</link>
14	14	</web>

...	...	@@ -46,7 +46,7 @@
46	46	<filter-name>CorsFilter</filter-name>
47	47	<url-pattern>/*</url-pattern>
48	48	</filter-mapping>
49		--->
	49	+ -->
50	50	<!--end跨域结束-->
51	51
52	52	<servlet-mapping>

...	...	@@ -174,7 +174,7 @@
174	174
175	175
176	176	public void syncBabyData(String oracleHid, Integer mysqlHid) {
177		- DataUtil.initData(mysqlHid);
	177	+ DataUtil.initData(mysqlHid,oracleHid);
178	178	initBabyGuides();
179	179	new workerBaby(oracleHid).start();
180	180	}
...	...	@@ -215,7 +215,7 @@
215	215	public void syncPatientData(String oracleHid,Integer mysqlHid) {
216	216
217	217	//初始化数据
218		- DataUtil.initData(mysqlHid);
	218	+ DataUtil.initData(mysqlHid,oracleHid);
219	219
220	220	String sql = "select replace(mp.P_NO,'-','') as PID,mp.*,p_birthday,p_name,floor((trunc(sysdate) - trunc(mp.P_LASTMENSTRUALPERIOD)+1) /7) as weeks,vc.VC_CARDNO from MOMMY_PATIENT mp left join Plat_Patient pp " +
221	221	" on mp.p_platpatientid=pp.p_id left join (select max(VC_OPERTIME) as OPERTIME,VC_CARDNO,VC_PATIENTNO from MOMMY_VISITCARD group by VC_CARDNO,VC_PATIENTNO) vc on vc.VC_PATIENTNO = mp.P_NO " +
...	...	@@ -638,8 +638,7 @@
638	638	patients.setAddressPostRest(DataUtil.getString(map.get("P_HUSBANDRRSTREET"))); // 详细地址
639	639	patients.setFileCode(DataUtil.getString(map.get("P_FILENUMBER"))); //建档编号
640	640	patients.setVcCardNo(DataUtil.getString(map.get("VC_CARDNO"))); //就诊卡号
641		- //是否隐藏 0 隐藏 1 显示
642		- patients.setEnable("1");
	641	+
643	642
644	643	mongoTemplate.save(patients);
645	644	System.out.println(patients.getId() + "============");

...	...	@@ -18,9 +18,9 @@
18	18	private static Integer orgId = 0;
19	19
20	20
21		- public static void initData(Integer mysqlHid) {
	21	+ public static void initData(Integer mysqlHid,String oracleHid) {
22	22	orgId = mysqlHid;
23		- List<Map<String, Object>> listEmp = JDBCUtil.getOracleListDataBySql("select e.e_name,e.e_id from mommy_employee e");
	23	+ List<Map<String, Object>> listEmp = JDBCUtil.getOracleListDataBySql("select e.e_name,e.e_id from mommy_employee e where e.e_hospitalid = '" + oracleHid+"'");
24	24	for (Map<String, Object> map : listEmp) {
25	25	employees.put(getString(map.get("E_ID")), getString(map.get("E_NAME")));
26	26	}

...	...	@@ -43,7 +43,7 @@
43	43	Connection con = null;
44	44	try {
45	45	Class.forName("com.mysql.jdbc.Driver");
46		- String url = "jdbc:mysql://192.168.1.26:3306/sync_platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8";
	46	+ String url = "jdbc:mysql://192.168.1.39:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8";
47	47	String userName = "platform";
48	48	String pwd = "platform123";
49	49	con = DriverManager.getConnection(url, userName, pwd);

GITLAB

jiangjiazhi / regional-platform

Merge remote-tracking branch 'origin/master'