jiangjiazhi / regional-platform

Commit 0be8c3fd9a71b505dd2bab535b6947c6f584ef79

Authored by [wangbo] about 6 years ago

Exists in master and in 6 other branches

体重营养管理末次月经修改

Showing 6 changed files with 258 additions and 196 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java

...	...	@@ -10,7 +10,7 @@
10	10	*/
11	11	public class DiagnoseEnums {
12	12
13		- public enum DiagnoseItemEnums{
	13	+ public enum DiagnoseItemEnums {
14	14	age(1, "年龄（出生日期）"),
15	15	bmi(2, "BMI（体重指数）"),
16	16	height(3, "身高"),
17	17
18	18
...	...	@@ -29,12 +29,15 @@
29	29	ckjc(16, "产科检查"),
30	30	bc(17, "B超"),
31	31	BCRSQK(18, "本次妊娠情况");
	32	+
32	33	private DiagnoseItemEnums(int id, String title) {
33	34	this.id = id;
34	35	this.title = title;
35	36	}
	37	+
36	38	private int id;
37	39	private String title;
	40	+
38	41	public static String getTitleById(int id) {
39	42	for (DiagnoseItemEnums yn : values()) {
40	43	if (yn.getId() == id) {
...	...	@@ -43,6 +46,7 @@
43	46	}
44	47	return null;
45	48	}
	49	+
46	50	public int getId() {
47	51	return id;
48	52	}
49	53
50	54
51	55
52	56
53	57
54	58
...	...	@@ -53,49 +57,48 @@
53	57	}
54	58
55	59
56		- public enum CompareEnums{
57		- GL(1, "大于(>)",">"),
58		- GLE(2, "大于等于(>=)",">="),
59		- LT(3, "小于(<)","<"),
60		- LTE(4, "小于等于(<=)","<="),
61		- EQ(5, "等于(=)","="),
62		- NEQ(6, "不等于(!=)","!=");
63		- private CompareEnums(int id, String title,String expression) {
	60	+ public enum CompareEnums {
	61	+ GL(1, "大于(>)", ">"),
	62	+ GLE(2, "大于等于(>=)", ">="),
	63	+ LT(3, "小于(<)", "<"),
	64	+ LTE(4, "小于等于(<=)", "<="),
	65	+ EQ(5, "等于(=)", "="),
	66	+ NEQ(6, "不等于(!=)", "!=");
	67	+
	68	+ private CompareEnums(int id, String title, String expression) {
64	69	this.id = id;
65	70	this.title = title;
66	71	this.expression = expression;
67	72	}
	73	+
68	74	private int id;
69	75	private String title;
70	76	private String expression;
71	77
72		- public static String getTitleById(Integer id)
73		- {
74		- for(CompareEnums s : CompareEnums.values()) {
75		- if (s.getId() == id)
76		- {
	78	+ public static String getTitleById(Integer id) {
	79	+ for (CompareEnums s : CompareEnums.values()) {
	80	+ if (s.getId() == id) {
77	81	return s.getTitle();
78	82	}
79	83
80	84	}
81		- return "";
	85	+ return "";
82	86	}
83	87
84		- public static String getExpressionById(Integer id)
85		- {
86		- for(CompareEnums s : CompareEnums.values()) {
87		- if (s.getId() == id)
88		- {
	88	+ public static String getExpressionById(Integer id) {
	89	+ for (CompareEnums s : CompareEnums.values()) {
	90	+ if (s.getId() == id) {
89	91	return s.getExpression();
90	92	}
91	93
92	94	}
93		- return "";
	95	+ return "";
94	96	}
95	97
96	98	public String getExpression() {
97	99	return expression;
98	100	}
	101	+
99	102	public int getId() {
100	103	return id;
101	104	}
...	...	@@ -106,7 +109,7 @@
106	109	}
107	110
108	111
109		- public enum TypeEnums{
	112	+ public enum TypeEnums {
110	113
111	114	SZ(1, "数值比较"),
112	115	WZ(2, "文字包含"),
113	116
114	117
...	...	@@ -118,19 +121,18 @@
118	121	this.id = id;
119	122	this.title = title;
120	123	}
	124	+
121	125	private int id;
122	126	private String title;
123	127
124		- public static String getTitleById(Integer id)
125		- {
126		- for(TypeEnums s : TypeEnums.values()) {
127		- if (s.getId() == id)
128		- {
	128	+ public static String getTitleById(Integer id) {
	129	+ for (TypeEnums s : TypeEnums.values()) {
	130	+ if (s.getId() == id) {
129	131	return s.getTitle();
130	132	}
131	133
132	134	}
133		- return "";
	135	+ return "";
134	136	}
135	137
136	138	public int getId() {
137	139
138	140
139	141
140	142
141	143
142	144
143	145
144	146
...	...	@@ -143,47 +145,45 @@
143	145	}
144	146
145	147
146		- public enum LogicEnums{
	148	+ public enum LogicEnums {
147	149
148		- Q(1, "且","&&"),
149		- H(2, "或","\|\|");
	150	+ Q(1, "且", "&&"),
	151	+ H(2, "或", "\|\|");
150	152
151		- private LogicEnums(int id, String title,String expression) {
	153	+ private LogicEnums(int id, String title, String expression) {
152	154	this.id = id;
153	155	this.title = title;
154	156	this.expression = expression;
155	157	}
	158	+
156	159	private int id;
157	160	private String title;
158	161	private String expression;
159	162
160		- public static String getTitleById(Integer id)
161		- {
162		- for(LogicEnums s : LogicEnums.values()) {
163		- if (s.getId() == id)
164		- {
	163	+ public static String getTitleById(Integer id) {
	164	+ for (LogicEnums s : LogicEnums.values()) {
	165	+ if (s.getId() == id) {
165	166	return s.getTitle();
166	167	}
167	168
168	169	}
169		- return "";
	170	+ return "";
170	171	}
171	172
172		- public static String getExpressionById(Integer id)
173		- {
174		- for(LogicEnums s : LogicEnums.values()) {
175		- if (s.getId() == id)
176		- {
	173	+ public static String getExpressionById(Integer id) {
	174	+ for (LogicEnums s : LogicEnums.values()) {
	175	+ if (s.getId() == id) {
177	176	return s.getExpression();
178	177	}
179	178
180	179	}
181		- return "";
	180	+ return "";
182	181	}
183	182
184	183	public String getExpression() {
185	184	return expression;
186	185	}
	186	+
187	187	public int getId() {
188	188	return id;
189	189	}
190	190
191	191
192	192
193	193
194	194
195	195
196	196
197	197
198	198
199	199
200	200
201	201
202	202
203	203
204	204
205	205
206	206
207	207
208	208
209	209
...	...	@@ -195,108 +195,116 @@
195	195
196	196
197	197	/**
198		- * isRepeat 0 重复 1不可重复
	198	+ * isRepeat 0 重复 1不可重复
199	199	*/
200		- public enum DiagnoseDetailItemEnums{
	200	+ public enum DiagnoseDetailItemEnums {
201	201
202	202	//一般检查
203		- XZ(1, "心脏",4,TypeEnums.WZ.getId(),0,""),
204		- FB(2, "肺部",4,TypeEnums.WZ.getId(),0,""),
	203	+ XZ(1, "心脏", 4, TypeEnums.WZ.getId(), 0, ""),
	204	+ FB(2, "肺部", 4, TypeEnums.WZ.getId(), 0, ""),
	205	+ XY(64, "血压", 19, TypeEnums.SZ.getId(), 0, ""),
205	206
206	207	//辅助检查——血常规
207		- XHDB(3, "血红蛋白",5,TypeEnums.SZ.getId(),0,"g/L"),
208		- BXBJS(4, "白细胞计数",5,TypeEnums.SZ.getId(),0,"×10<sup>9</sup>/L"),
209		- XXBJX(5, "血小板计数",5,TypeEnums.SZ.getId(),0,"×10<sup>9</sup>/L"),
210		- CXGQT(6, "其他",5,TypeEnums.WZ.getId(),0,""),
	208	+ XHDB(3, "血红蛋白", 5, TypeEnums.SZ.getId(), 0, "g/L"),
	209	+ BXBJS(4, "白细胞计数", 5, TypeEnums.SZ.getId(), 0, "×10<sup>9</sup>/L"),
	210	+ XXBJX(5, "血小板计数", 5, TypeEnums.SZ.getId(), 0, "×10<sup>9</sup>/L"),
	211	+ CXGQT(6, "其他", 5, TypeEnums.WZ.getId(), 0, ""),
211	212
212	213	//辅助检查——血型
213		- RHXX(7, "RH血型——阳性（+）",6,TypeEnums.WZJ.getId(),1,""),
214		- XT(8, "血糖",6,TypeEnums.SZ.getId(),0,"mmol/L"),
	214	+ RHXX(7, "RH血型——阳性（+）", 6, TypeEnums.WZJ.getId(), 1, ""),
	215	+ // XT(8, "血糖",6,TypeEnums.SZ.getId(),0,"mmol/L"),
	216	+ /**
	217	+ * 20190808提出来
	218	+ */
	219	+ XT(8, "血糖", 20, TypeEnums.SZ.getId(), 0, "mmol/L"),
215	220
216		-
217	221	//辅助检查——肝功能
218		- XQGBZAM(9, "血清谷丙转氨酶",7,TypeEnums.SZ.getId(),0,"U/L"),
219		- XQGCZAM(10, "血清谷草转氨酶",7,TypeEnums.SZ.getId(),0,"U/L"),
220		- BDB(11, "白蛋白",7,TypeEnums.SZ.getId(),0,"g/L"),
221		- ZDHS(12, "总胆红素",7,TypeEnums.SZ.getId(),0,"umol/L"),
222		- JHDHS(13, "结合胆红素",7,TypeEnums.SZ.getId(),0,"umol/L"),
223		- GGNBG(14, "丙肝——阳性（+）",7,TypeEnums.WZJ.getId(),1,""),
	222	+ XQGBZAM(9, "血清谷丙转氨酶", 7, TypeEnums.SZ.getId(), 0, "U/L"),
	223	+ XQGCZAM(10, "血清谷草转氨酶", 7, TypeEnums.SZ.getId(), 0, "U/L"),
	224	+ BDB(11, "白蛋白", 7, TypeEnums.SZ.getId(), 0, "g/L"),
	225	+ ZDHS(12, "总胆红素", 7, TypeEnums.SZ.getId(), 0, "umol/L"),
	226	+ JHDHS(13, "结合胆红素", 7, TypeEnums.SZ.getId(), 0, "umol/L"),
224	227
	228	+ //GGNBG(14, "丙肝——阳性（+）", 7, TypeEnums.WZJ.getId(), 1, ""),
	229	+ /**
	230	+ * 20190808 剔除出来
	231	+ **/
	232	+ GGNBG(14, "丙肝——阳性（+）", 21, TypeEnums.WZJ.getId(), 1, ""),
225	233	// 辅助检查——乙肝五项
226		- YGBMKY(15, "乙肝表面抗原——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
227		- YGBMKT(16, "乙肝表面抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
228		- YGEKY(17, "乙肝e抗原——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
229		- YGEKT(18, "乙肝e抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
230		- YGHXKT(19, "乙肝核心抗体——阳性（+）",8,TypeEnums.WZJ.getId(),1,""),
	234	+ YGBMKY(15, "乙肝表面抗原——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""),
	235	+ YGBMKT(16, "乙肝表面抗体——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""),
	236	+ YGEKY(17, "乙肝e抗原——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""),
	237	+ YGEKT(18, "乙肝e抗体——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""),
	238	+ YGHXKT(19, "乙肝核心抗体——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""),
231	239
232	240	//辅助检查——肾功能
233		- XQJG(20, "血清肌酐",9,TypeEnums.SZ.getId(),0,"μmol/L"),
234		- XNSD(21, "血尿素氮",9,TypeEnums.SZ.getId(),0,"mmol/L"),
	241	+ XQJG(20, "血清肌酐", 9, TypeEnums.SZ.getId(), 0, "μmol/L"),
	242	+ XNSD(21, "血尿素氮", 9, TypeEnums.SZ.getId(), 0, "mmol/L"),
235	243
236	244	//辅助检查——梅毒血清实验
237		- SYJGYXYQZ(22, "实验结果——阳性（+）已确诊 ",10,TypeEnums.WZJ.getId(),1,""),
238		- SYJGYXCZJG(23, "实验结果——阳性（+）初诊结果 ",10,TypeEnums.WZJ.getId(),1,""),
	245	+ SYJGYXYQZ(22, "实验结果——阳性（+）已确诊 ", 10, TypeEnums.WZJ.getId(), 1, ""),
	246	+ SYJGYXCZJG(23, "实验结果——阳性（+）初诊结果 ", 10, TypeEnums.WZJ.getId(), 1, ""),
239	247
240		- HIVYQZ(63, "HIV抗体检测——阳性（+）已确诊",10,TypeEnums.WZJ.getId(),1,""),
241		- HIVCZJG(64, "HIV抗体检测——阳性（+）初诊结果",10,TypeEnums.WZJ.getId(),1,""),
	248	+ HIVYQZ(63, "HIV抗体检测——阳性（+）已确诊", 10, TypeEnums.WZJ.getId(), 1, ""),
	249	+ HIVCZJG(64, "HIV抗体检测——阳性（+）初诊结果", 10, TypeEnums.WZJ.getId(), 1, ""),
242	250
243	251	//妇科手术史（盆腔手术史）
244		- YWRSSS(24, "异位妊娠手术",11,TypeEnums.WZJ.getId(),1,""),
245		- ZGJLXC(25, "子宫肌瘤剥除",11,TypeEnums.WZJ.getId(),1,""),
246		- PGC(26, "剖宫产",11,TypeEnums.WZJ.getId(),1,""),
247		- FKSSSQT(27, "其他",11,TypeEnums.WZ.getId(),0,""),
	252	+ YWRSSS(24, "异位妊娠手术", 11, TypeEnums.WZJ.getId(), 1, ""),
	253	+ ZGJLXC(25, "子宫肌瘤剥除", 11, TypeEnums.WZJ.getId(), 1, ""),
	254	+ PGC(26, "剖宫产", 11, TypeEnums.WZJ.getId(), 1, ""),
	255	+ FKSSSQT(27, "其他", 11, TypeEnums.WZ.getId(), 0, ""),
248	256
249	257	//孕产史
250		- LCC(28, "流产次",12,TypeEnums.SZ.getId(),0,""),
251		- CC(29, "产次",12,TypeEnums.SZ.getId(),0,""),
252		- YCC(30, "引产次",12,TypeEnums.SZ.getId(),0,""),
253		- PGCC(31, "剖宫产次",12,TypeEnums.SZ.getId(),0,""),
	258	+ LCC(28, "流产次", 12, TypeEnums.SZ.getId(), 0, ""),
	259	+ CC(29, "产次", 12, TypeEnums.SZ.getId(), 0, ""),
	260	+ YCC(30, "引产次", 12, TypeEnums.SZ.getId(), 0, ""),
	261	+ PGCC(31, "剖宫产次", 12, TypeEnums.SZ.getId(), 0, ""),
254	262
255	263	//妇科检查
256		- ZG(32, "子宫",13,TypeEnums.WZ.getId(),0,""),
257		- GJ(33, "宫颈",13,TypeEnums.WZ.getId(),0,""),
258		- FJ(34, "附件",13,TypeEnums.WZ.getId(),0,""),
	264	+ ZG(32, "子宫", 13, TypeEnums.WZ.getId(), 0, ""),
	265	+ GJ(33, "宫颈", 13, TypeEnums.WZ.getId(), 0, ""),
	266	+ FJ(34, "附件", 13, TypeEnums.WZ.getId(), 0, ""),
259	267
260	268	//既往史
261		- JWSXHXTL(35, "循环系统类",14,TypeEnums.XL.getId(),0,""),
262		- HXXTL(36, "呼吸系统类",14,TypeEnums.XL.getId(),0,""),
263		- MNXTL(37, "泌尿系统类",14,TypeEnums.XL.getId(),0,""),
264		- XHXTL(38, "消化系统类",14,TypeEnums.XL.getId(),0,""),
265		- XYXTL(39, "血液系统类",14,TypeEnums.XL.getId(),0,""),
266		- NFMXTL(40, "内分泌系统类",14,TypeEnums.XL.getId(),0,""),
267		- DXYYL(41, "代谢营养类",14,TypeEnums.XL.getId(),0,""),
268		- JWSQT(42, "其他",14,TypeEnums.WZ.getId(),0,""),
	269	+ JWSXHXTL(35, "循环系统类", 14, TypeEnums.XL.getId(), 0, ""),
	270	+ HXXTL(36, "呼吸系统类", 14, TypeEnums.XL.getId(), 0, ""),
	271	+ MNXTL(37, "泌尿系统类", 14, TypeEnums.XL.getId(), 0, ""),
	272	+ XHXTL(38, "消化系统类", 14, TypeEnums.XL.getId(), 0, ""),
	273	+ XYXTL(39, "血液系统类", 14, TypeEnums.XL.getId(), 0, ""),
	274	+ NFMXTL(40, "内分泌系统类", 14, TypeEnums.XL.getId(), 0, ""),
	275	+ DXYYL(41, "代谢营养类", 14, TypeEnums.XL.getId(), 0, ""),
	276	+ JWSQT(42, "其他", 14, TypeEnums.WZ.getId(), 0, ""),
269	277
270	278	//传染病史
271		- YG(43, "乙肝",15,TypeEnums.WZJ.getId(),1,""),
272		- BG(44, "丙肝",15,TypeEnums.WZJ.getId(),1,""),
273		- AZ(45, "艾滋",15,TypeEnums.WZJ.getId(),1,""),
274		- MD(46, "梅毒",15,TypeEnums.WZJ.getId(),1,""),
275		- CRBSQT(47, "其他",15,TypeEnums.WZ.getId(),0,""),
	279	+ YG(43, "乙肝", 15, TypeEnums.WZJ.getId(), 1, ""),
	280	+ BG(44, "丙肝", 15, TypeEnums.WZJ.getId(), 1, ""),
	281	+ AZ(45, "艾滋", 15, TypeEnums.WZJ.getId(), 1, ""),
	282	+ MD(46, "梅毒", 15, TypeEnums.WZJ.getId(), 1, ""),
	283	+ CRBSQT(47, "其他", 15, TypeEnums.WZ.getId(), 0, ""),
276	284
277	285	//产科检查
278		- GG(48, "宫高",16,TypeEnums.SZ.getId(),0,"cm"),
279		- FW(49, "腹围",16,TypeEnums.SZ.getId(),0,"cm"),
280		- FZ(50, "浮肿",16,TypeEnums.XL.getId(),0,""),
281		- TSEST(51, "胎数=双胎",16,TypeEnums.WZ.getId(),0,""),
282		- TSLYST(52, "胎数>双胎",16,TypeEnums.WZ.getId(),0,""),
	286	+ GG(48, "宫高", 16, TypeEnums.SZ.getId(), 0, "cm"),
	287	+ FW(49, "腹围", 16, TypeEnums.SZ.getId(), 0, "cm"),
	288	+ FZ(50, "浮肿", 16, TypeEnums.XL.getId(), 0, ""),
	289	+ TSEST(51, "胎数=双胎", 16, TypeEnums.WZ.getId(), 0, ""),
	290	+ TSLYST(52, "胎数>双胎", 16, TypeEnums.WZ.getId(), 0, ""),
283	291
284	292	//B超
285		- BC(53, "B超",17,TypeEnums.WZ.getId(),0,""),
	293	+ BC(53, "B超", 17, TypeEnums.WZ.getId(), 0, ""),
286	294
287	295	//本次妊娠情况
288		- EX(54, "恶心",18,TypeEnums.WZJ.getId(),1,""),
289		- OT(55, "呕吐",18,TypeEnums.WZJ.getId(),1,""),
290		- YH(56, "眼花",18,TypeEnums.WZJ.getId(),1,""),
291		- XM(57, "胸闷",18,TypeEnums.WZJ.getId(),1,""),
292		- FUZ(58, "浮肿",18,TypeEnums.WZJ.getId(),1,""),
293		- YDCX(59, "阴道出血",18,TypeEnums.WZJ.getId(),1,""),
294		- FT(60, "腹痛",18,TypeEnums.WZJ.getId(),1,""),
295		- TT(61, "头痛",18,TypeEnums.WZJ.getId(),1,""),
296		- FBXZG(62, "下腹部下坠感",18,TypeEnums.WZJ.getId(),1,""),
297		- BCRSQKQT(63, "其他",18,TypeEnums.WZ.getId(),0,"");
	296	+ EX(54, "恶心", 18, TypeEnums.WZJ.getId(), 1, ""),
	297	+ OT(55, "呕吐", 18, TypeEnums.WZJ.getId(), 1, ""),
	298	+ YH(56, "眼花", 18, TypeEnums.WZJ.getId(), 1, ""),
	299	+ XM(57, "胸闷", 18, TypeEnums.WZJ.getId(), 1, ""),
	300	+ FUZ(58, "浮肿", 18, TypeEnums.WZJ.getId(), 1, ""),
	301	+ YDCX(59, "阴道出血", 18, TypeEnums.WZJ.getId(), 1, ""),
	302	+ FT(60, "腹痛", 18, TypeEnums.WZJ.getId(), 1, ""),
	303	+ TT(61, "头痛", 18, TypeEnums.WZJ.getId(), 1, ""),
	304	+ FBXZG(62, "下腹部下坠感", 18, TypeEnums.WZJ.getId(), 1, ""),
	305	+ BCRSQKQT(63, "其他", 18, TypeEnums.WZ.getId(), 0, "");
298	306
299		- private DiagnoseDetailItemEnums(int id, String title,Integer parentId,Integer type,Integer isRepeat,String unit) {
	307	+ private DiagnoseDetailItemEnums(int id, String title, Integer parentId, Integer type, Integer isRepeat, String unit) {
300	308	this.id = id;
301	309	this.title = title;
302	310	this.parentId = parentId;
...	...	@@ -304,6 +312,7 @@
304	312	this.isRepeat = isRepeat;
305	313	this.unit = unit;
306	314	}
	315	+
307	316	private int id;
308	317	private String title;
309	318	private Integer parentId;
310	319
311	320
312	321
...	...	@@ -311,29 +320,25 @@
311	320	private Integer isRepeat;
312	321	private String unit;
313	322
314		- public static String getTitleById(Integer id)
315		- {
316		- for(DiagnoseDetailItemEnums s : DiagnoseDetailItemEnums.values()) {
317		- if (s.getId() == id)
318		- {
	323	+ public static String getTitleById(Integer id) {
	324	+ for (DiagnoseDetailItemEnums s : DiagnoseDetailItemEnums.values()) {
	325	+ if (s.getId() == id) {
319	326	return s.getTitle();
320	327	}
321	328
322	329	}
323		- return "";
	330	+ return "";
324	331	}
325	332
326	333
327		- public static Integer getIdByName(String name)
328		- {
329		- for(DiagnoseDetailItemEnums s : DiagnoseDetailItemEnums.values()) {
330		- if (s.getTitle().toLowerCase().equals(name.toLowerCase()))
331		- {
	334	+ public static Integer getIdByName(String name) {
	335	+ for (DiagnoseDetailItemEnums s : DiagnoseDetailItemEnums.values()) {
	336	+ if (s.getTitle().toLowerCase().equals(name.toLowerCase())) {
332	337	return s.getId();
333	338	}
334	339
335	340	}
336		- return null;
	341	+ return null;
337	342	}
338	343
339	344	public int getId() {
340	345
341	346
342	347
343	348
344	349
345	350
346	351
347	352
348	353
349	354
350	355
351	356
352	357
353	358
354	359
355	360
...	...	@@ -378,102 +383,99 @@
378	383	}
379	384
380	385
381		- public enum JwsChildEnums{
	386	+ public enum JwsChildEnums {
382	387
383	388	//循环系统类
384		- GXY(1, "高血压",35),
385		- XXB(2, "先心病",35),
386		- GXB(3, "冠心病",35),
387		- XJT(4, "心绞痛",35),
388		- XJQX(5, "心肌缺血",35),
389		- XNBY(6, "心内膜炎",35),
390		- XJB(7, "心肌病",35),
391		- XJY(8, "心肌炎",35),
392		- XBY(9, "心包炎",35),
393		- XLSC(10, "心律失常",35),
	389	+ GXY(1, "高血压", 35),
	390	+ XXB(2, "先心病", 35),
	391	+ GXB(3, "冠心病", 35),
	392	+ XJT(4, "心绞痛", 35),
	393	+ XJQX(5, "心肌缺血", 35),
	394	+ XNBY(6, "心内膜炎", 35),
	395	+ XJB(7, "心肌病", 35),
	396	+ XJY(8, "心肌炎", 35),
	397	+ XBY(9, "心包炎", 35),
	398	+ XLSC(10, "心律失常", 35),
394	399
395	400
396	401	//呼吸系统类
397		- ZQGY(11, "支气管炎",36),
398		- XC(12, "哮喘",36),
399		- JH(13, "结核",36),
400		- FY(14, "肺炎",36),
	402	+ ZQGY(11, "支气管炎", 36),
	403	+ XC(12, "哮喘", 36),
	404	+ JH(13, "结核", 36),
	405	+ FY(14, "肺炎", 36),
401	406
402	407
403	408	//泌尿系统类
404		- SJS(15, "肾结石",37),
405		- SB(16, "肾病",37),
406		- SY(17, "肾炎",37),
407		- SXQSB(18, "肾小球肾病",37),
408		- SXQSY(19, "肾小球肾炎",37),
409		- LGASB(20, "IgA肾病",37),
	409	+ SJS(15, "肾结石", 37),
	410	+ SB(16, "肾病", 37),
	411	+ SY(17, "肾炎", 37),
	412	+ SXQSB(18, "肾小球肾病", 37),
	413	+ SXQSY(19, "肾小球肾炎", 37),
	414	+ LGASB(20, "IgA肾病", 37),
410	415
411	416	//消化系统类
412		- YXGD(21, "乙型病毒性肝炎",38),
413		- WY(22, "胃炎",38),
	417	+ YXGD(21, "乙型病毒性肝炎", 38),
	418	+ WY(22, "胃炎", 38),
414	419
415		- YXGY(46, "乙型肝炎",38),
	420	+ YXGY(46, "乙型肝炎", 38),
416	421
417		- DSY(23, "大三阳",38),
418		- XSY(24, "小三阳",38),
419		- BXGY(25, "丙型肝炎",38),
420		- YGBMKYYX(26, "乙肝表面抗原阳性",38),
421		- XHXKY(27, "消化性溃疡",38),
422		- JCY(28, "结肠炎",38),
423		- GNXXHBL(29, "功能性消化不良",38),
424		- MXFX(30, "慢性腹泻",38),
	422	+ DSY(23, "大三阳", 38),
	423	+ XSY(24, "小三阳", 38),
	424	+ BXGY(25, "丙型肝炎", 38),
	425	+ YGBMKYYX(26, "乙肝表面抗原阳性", 38),
	426	+ XHXKY(27, "消化性溃疡", 38),
	427	+ JCY(28, "结肠炎", 38),
	428	+ GNXXHBL(29, "功能性消化不良", 38),
	429	+ MXFX(30, "慢性腹泻", 38),
425	430
426	431
427	432	//血液系统类
428		- PX(31, "贫血",39),
429		- XXBJS(32, "血小板减少",39),
430		- ZB(33, "紫癜",39),
	433	+ PX(31, "贫血", 39),
	434	+ XXBJS(32, "血小板减少", 39),
	435	+ ZB(33, "紫癜", 39),
431	436
432	437	//内分泌系统类
433		- JZXGNKJZ(34, "甲状腺功能亢进症",40),
434		- JZXGNJTZ(35, "甲状腺功能减退症",40),
435		- JZXY(36, "甲状腺炎",40),
	438	+ JZXGNKJZ(34, "甲状腺功能亢进症", 40),
	439	+ JZXGNJTZ(35, "甲状腺功能减退症", 40),
	440	+ JZXY(36, "甲状腺炎", 40),
436	441
437	442	//代谢营养类
438		- TNB(37, "糖尿病",41),
439		- FPZ(38, "肥胖症",41),
440		- GZSS(39, "骨质疏松症",41),
441		- GNSXZ(40, "高尿酸血症",41),
442		- TF(41, "痛风",41),
	443	+ TNB(37, "糖尿病", 41),
	444	+ FPZ(38, "肥胖症", 41),
	445	+ GZSS(39, "骨质疏松症", 41),
	446	+ GNSXZ(40, "高尿酸血症", 41),
	447	+ TF(41, "痛风", 41),
443	448
444		- A(42, "-",50),
445		- B(43, "+",50),
446		- C(44, "++",50),
447		- D(45, "+++",50);
	449	+ A(42, "-", 50),
	450	+ B(43, "+", 50),
	451	+ C(44, "++", 50),
	452	+ D(45, "+++", 50);
448	453
449		- private JwsChildEnums(int id, String title,Integer parentId) {
	454	+ private JwsChildEnums(int id, String title, Integer parentId) {
450	455	this.id = id;
451	456	this.title = title;
452	457	this.parentId = parentId;
453	458	}
	459	+
454	460	private int id;
455	461	private String title;
456	462	private Integer parentId;
457	463
458		- public static String getTitleById(Integer id)
459		- {
460		- for(JwsChildEnums s : JwsChildEnums.values()) {
461		- if (s.getId() == id)
462		- {
	464	+ public static String getTitleById(Integer id) {
	465	+ for (JwsChildEnums s : JwsChildEnums.values()) {
	466	+ if (s.getId() == id) {
463	467	return s.getTitle();
464	468	}
465	469
466	470	}
467		- return "";
	471	+ return "";
468	472	}
469	473
470	474
471		- public static List<Map> getMapByParentId(Integer parentId)
472		- {
	475	+ public static List<Map> getMapByParentId(Integer parentId) {
473	476	List<Map> list = new ArrayList<>();
474		- for(JwsChildEnums s : JwsChildEnums.values()) {
475		- if (s.getParentId() == parentId)
476		- {
	477	+ for (JwsChildEnums s : JwsChildEnums.values()) {
	478	+ if (s.getParentId() == parentId) {
477	479	Map map = new HashMap();
478	480	map.put("id", s.getId());
479	481	map.put("title", s.getTitle());
480	482
...	...	@@ -484,13 +486,11 @@
484	486	}
485	487
486	488
487		- public static Integer getIdByParentName(String parentName,String name)
488		- {
	489	+ public static Integer getIdByParentName(String parentName, String name) {
489	490	Integer parentId = DiagnoseDetailItemEnums.getIdByName(parentName);
490		- for(JwsChildEnums s : JwsChildEnums.values()) {
491		- if (s.getParentId() == parentId && s.getTitle().toLowerCase().equals(name.toLowerCase()))
492		- {
493		- return s.getId();
	491	+ for (JwsChildEnums s : JwsChildEnums.values()) {
	492	+ if (s.getParentId() == parentId && s.getTitle().toLowerCase().equals(name.toLowerCase())) {
	493	+ return s.getId();
494	494	}
495	495	}
496	496	return null;

...	...	@@ -274,7 +274,7 @@
274	274	@TokenRequired
275	275	public BaseResponse getWeightsReport(@PathVariable String pid,
276	276	HttpServletRequest request,
277		- @RequestParam(value = "rid", required = false) String rid, String version,@RequestParam(value = "doctorId") String doctorId) {
	277	+ @RequestParam(value = "rid", required = false) String rid, String version, @RequestParam(value = "doctorId") String doctorId) {
278	278	if (pid.isEmpty() \|\| "null".equals(pid)) {
279	279	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!");
280	280	}
281	281
...	...	@@ -293,11 +293,21 @@
293	293	@TokenRequired
294	294	public BaseResponse qhdReport(@PathVariable String pid,
295	295	HttpServletRequest request,
296		- @RequestParam(value = "rid", required = false) String rid, String version,@RequestParam(value = "doctorId") String doctorId) {
	296	+ @RequestParam(value = "rid", required = false) String rid, String version, @RequestParam(value = "doctorId") String doctorId) {
297	297	if (pid.isEmpty() \|\| "null".equals(pid)) {
298	298	return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!");
299	299	}
300	300	return patientWeightService.qhdHighRiskReport(pid, getUserId(request), rid, version, doctorId);
	301	+ }
	302	+
	303	+ /**
	304	+ * 修改末次月经
	305	+ */
	306	+ @RequestMapping(value = "/updateLastMenstrual", method = RequestMethod.POST)
	307	+ @ResponseBody
	308	+ @TokenRequired
	309	+ public BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo) {
	310	+ return patientWeightService.updateLastMenstrual(lastMenstrual, cardNo);
301	311	}
302	312
303	313	}

...	...	@@ -3770,6 +3770,7 @@
3770	3770	}
3771	3771	}
3772	3772
	3773	+
3773	3774	Map<Integer, List<DiagnoseItemModel>> mapItems = getRiskConfig(configModels);
3774	3775	if (mapItems != null && mapItems.size() > 0) {
3775	3776	if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.age.getId())) {
...	...	@@ -3918,6 +3919,20 @@
3918	3919	}
3919	3920	}
3920	3921	}
	3922	+ //血压
	3923	+ if (!antExcAddRequest.getBp().isEmpty() && antExcAddRequest.getBp().size() > 0) {
	3924	+ Map map = antExcAddRequest.getBp();
	3925	+ List<DiagnoseItemModel> ybjcItems = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ybjc.getId());
	3926	+ if (CollectionUtils.isNotEmpty(ybjcItems)) {
	3927	+ for (DiagnoseItemModel item : ybjcItems) {
	3928	+ if ((double) map.get("ssy") > Double.valueOf(item.getValueOne()) && (double) map.get("ssy") < Double.valueOf(item.getValueTwo())) {
	3929	+ list.addAll(item.getRiskIds());
	3930	+ } else if ((double) map.get("szy") > Double.valueOf(item.getValueThree()) && (double) map.get("szy") < Double.valueOf(item.getValueFour())) {
	3931	+ list.addAll(item.getRiskIds());
	3932	+ }
	3933	+ }
	3934	+ }
	3935	+ }
3921	3936	}
3922	3937	if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.bc.getId())) {
3923	3938	if (StringUtils.isNotEmpty(antExcAddRequest.getbChao())) {
...	...	@@ -3984,6 +3999,7 @@
3984	3999	}
3985	4000	}
3986	4001
	4002	+
3987	4003	if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.xcg.getId())) {
3988	4004	if (StringUtils.isNotEmpty(antExcAddRequest.getXhdb())) {
3989	4005	String xhdb = antExcAddRequest.getXhdb();
...	...	@@ -4174,6 +4190,7 @@
4174	4190	}
4175	4191	}
4176	4192
	4193	+
4177	4194	if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.ygwx.getId())) {
4178	4195	if (StringUtils.isNotEmpty(antExcAddRequest.getYgbmky())) {
4179	4196	if ("yang".equals(antExcAddRequest.getYgbmky())) {
...	...	@@ -4357,6 +4374,8 @@
4357	4374	}
4358	4375	}
4359	4376	}
	4377	+
	4378	+
4360	4379	if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.pqsss.getId())) {
4361	4380	if (antExcAddRequest.getFksxHistory() != null && antExcAddRequest.getFksxHistory().size() > 0) {
4362	4381	//妇科手术史（盆腔手术史）

...	...	@@ -161,6 +161,8 @@
161	161	private String tireNumber1;
162	162	//血压
163	163	private Map bp;
	164	+
	165	+ //丙肝
164	166	private String bg;
165	167	//胎数
166	168	private List<MatDeliverAddRequest.Placenta> placentas;

...	...	@@ -70,5 +70,9 @@
70	70	public void getSerie(Map<String, Map<Integer, Double>> series, String bmiStr, String bregmatic);
71	71
72	72	String getDoctorId(List<Map<String, Object>> dayWeights2);
	73	+
	74	+ BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo);
	75	+
	76	+
73	77	}

...	...	@@ -793,6 +793,33 @@
793	793	return "";
794	794	}
795	795
	796	+ /**
	797	+ * 修改末次月经
	798	+ */
	799	+ @Override
	800	+ public BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo) {
	801	+ if (StringUtils.isEmpty(cardNo)) {
	802	+ return RespBuilder.buildSuccess("查询号不能为空！");
	803	+ } else if (StringUtils.isEmpty(lastMenstrual)) {
	804	+ return RespBuilder.buildSuccess("请填写需要纠正的末次月经！");
	805	+ }
	806	+ //只查孕妇
	807	+ List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("cardNo").is(cardNo).and("type").is(1)), Patients.class);
	808	+ if (CollectionUtils.isNotEmpty(patients)) {
	809	+ Patients patient = new Patients();
	810	+ patient.setLastMenses(DateUtil.parseYMD(lastMenstrual));
	811	+
	812	+ System.out.println(DateUtil.parseYMD(lastMenstrual));
	813	+ for (Patients p : patients) {
	814	+ patientsService.updatePatientOne(patient, p.getId());
	815	+ }
	816	+ return RespBuilder.buildSuccess("成功！");
	817	+ } else {
	818	+ return RespBuilder.buildSuccess("该孕妇已分娩或未建档！");
	819	+ }
	820	+
	821	+ }
	822	+
796	823
797	824	@Override
798	825	public BaseResponse wxReport(String pid) {