Commit dc0ef2b2e4dd022f21e90e8a8fce0c06b65eb068
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 13 changed files
- platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/ComplexionEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/FeedTypeEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/NextVisitTimeEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/SkinEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/UmbilicalCordEnums.java
- platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
- platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.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/service/INewbornVisitService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
platform-common/src/main/java/com/lyms/platform/common/enums/BregmaticEnums.java
View file @
dc0ef2b
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 | + SUNKEN(3, "凹陷"), | |
11 | + OTHER(4, "其他"); | |
12 | + | |
13 | + private Integer id; | |
14 | + private String name; | |
15 | + | |
16 | + public static BregmaticEnums get(Integer id) { | |
17 | + BregmaticEnums[] values = BregmaticEnums.values(); | |
18 | + for (BregmaticEnums value : values) { | |
19 | + if (value.getId() == id) { | |
20 | + return value; | |
21 | + } | |
22 | + } | |
23 | + return null; | |
24 | + } | |
25 | + | |
26 | + BregmaticEnums(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 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/ComplexionEnums.java
View file @
dc0ef2b
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 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/FeedTypeEnums.java
View file @
dc0ef2b
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 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/NextVisitTimeEnums.java
View file @
dc0ef2b
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 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/SkinEnums.java
View file @
dc0ef2b
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 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/UmbilicalCordEnums.java
View file @
dc0ef2b
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 | +} |
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
dc0ef2b
... | ... | @@ -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 |
platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java
View file @
dc0ef2b
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 parentId; | |
25 | + | |
26 | + private String babyId; | |
27 | + | |
28 | + // 访视时间 | |
29 | + private Date checkTime; | |
30 | + | |
31 | + // 访视时间中文版 (比如 出生xx天) | |
32 | + private String checkTimeDesc; | |
33 | + | |
34 | + // 访视机构 | |
35 | + private String hospitalId; | |
36 | + | |
37 | + // 喂养方式 纯母乳/混合/人工 | |
38 | + private String feedType; | |
39 | + | |
40 | + // 喂奶量 | |
41 | + private String feedNumber; | |
42 | + | |
43 | + // 吃奶次数 | |
44 | + private Integer nurseNumber; | |
45 | + | |
46 | + // 新生儿体重 | |
47 | + private String weight; | |
48 | + | |
49 | + // 出生身长 | |
50 | + private String height; | |
51 | + | |
52 | + // 是否呕吐 | |
53 | + private boolean vomit; | |
54 | + | |
55 | + // 大便 | |
56 | + private String shit; | |
57 | + | |
58 | + // 大便次数 | |
59 | + private Integer shitNumber; | |
60 | + | |
61 | + // 体温 | |
62 | + private String temperature; | |
63 | + | |
64 | + // 现在体重 | |
65 | + private String weightNow; | |
66 | + | |
67 | + // 心率 | |
68 | + private String heartRate; | |
69 | + | |
70 | + // 呼吸频率 | |
71 | + private String respiratoryRate; | |
72 | + | |
73 | + // 皮肤 未见异常/湿疹/糜烂/其他 | |
74 | + private String skin; | |
75 | + | |
76 | + // 面色 红润/黄染/其他 | |
77 | + private String complexion; | |
78 | + | |
79 | + // 黄染部位 | |
80 | + private String ictericPart; | |
81 | + | |
82 | + // 前囟 正常/膨隆/凹陷/其他 | |
83 | + private String bregmatic; | |
84 | + | |
85 | + // 未闭合尺寸 | |
86 | + private String unclosedSize; | |
87 | + | |
88 | + // 眼外观 | |
89 | + private String eye; | |
90 | + | |
91 | + // 四肢活动 | |
92 | + private String limb; | |
93 | + | |
94 | + // 耳外观 | |
95 | + private String ear; | |
96 | + | |
97 | + // 颈部包块 | |
98 | + private String neck; | |
99 | + | |
100 | + // 鼻 | |
101 | + private String nose; | |
102 | + | |
103 | + // 口腔 | |
104 | + private String mouth; | |
105 | + | |
106 | + // 肛门 | |
107 | + private String gangmen; | |
108 | + | |
109 | + // 心肺听诊 | |
110 | + private String heartLung; | |
111 | + | |
112 | + // 脐带 未脱/脱落/脐部有渗出/其他 | |
113 | + private String umbilicalCord; | |
114 | + | |
115 | + // 腹部 | |
116 | + private String abdomen; | |
117 | + | |
118 | + // 脊柱 | |
119 | + private String spine; | |
120 | + | |
121 | + // 外生殖器 | |
122 | + private String extGenitalia; | |
123 | + | |
124 | + // 诊断 | |
125 | + private String diagnosis; | |
126 | + | |
127 | + // 处理意见 | |
128 | + private String handleOpinions; | |
129 | + | |
130 | + // 指导意见 | |
131 | + private String guidanceOpinion; | |
132 | + | |
133 | + // 医生 | |
134 | + private String doctor; | |
135 | + | |
136 | + // 访视地点 | |
137 | + private String visitLocation; | |
138 | + | |
139 | + // 下次访视时间 前端是枚举:出生0-42天 | |
140 | + private Date nextVisitTime; | |
141 | + | |
142 | + // 下次访视时间说明 | |
143 | + private String nextVisitTimeDesc; | |
144 | + | |
145 | + public String getParentId() { | |
146 | + return parentId; | |
147 | + } | |
148 | + | |
149 | + public void setParentId(String parentId) { | |
150 | + this.parentId = parentId; | |
151 | + } | |
152 | + | |
153 | + public String getBabyId() { | |
154 | + return babyId; | |
155 | + } | |
156 | + | |
157 | + public void setBabyId(String babyId) { | |
158 | + this.babyId = babyId; | |
159 | + } | |
160 | + | |
161 | + public String getId() { | |
162 | + return id; | |
163 | + } | |
164 | + | |
165 | + public void setId(String id) { | |
166 | + this.id = id; | |
167 | + } | |
168 | + | |
169 | + public Date getCreated() { | |
170 | + return created; | |
171 | + } | |
172 | + | |
173 | + public void setCreated(Date created) { | |
174 | + this.created = created; | |
175 | + } | |
176 | + | |
177 | + public String getYn() { | |
178 | + return yn; | |
179 | + } | |
180 | + | |
181 | + public void setYn(String yn) { | |
182 | + this.yn = yn; | |
183 | + } | |
184 | + | |
185 | + public Date getCheckTime() { | |
186 | + return checkTime; | |
187 | + } | |
188 | + | |
189 | + public void setCheckTime(Date checkTime) { | |
190 | + this.checkTime = checkTime; | |
191 | + } | |
192 | + | |
193 | + public String getCheckTimeDesc() { | |
194 | + return checkTimeDesc; | |
195 | + } | |
196 | + | |
197 | + public void setCheckTimeDesc(String checkTimeDesc) { | |
198 | + this.checkTimeDesc = checkTimeDesc; | |
199 | + } | |
200 | + | |
201 | + public String getHospitalId() { | |
202 | + return hospitalId; | |
203 | + } | |
204 | + | |
205 | + public void setHospitalId(String hospitalId) { | |
206 | + this.hospitalId = hospitalId; | |
207 | + } | |
208 | + | |
209 | + public String getFeedType() { | |
210 | + return feedType; | |
211 | + } | |
212 | + | |
213 | + public void setFeedType(String feedType) { | |
214 | + this.feedType = feedType; | |
215 | + } | |
216 | + | |
217 | + public String getFeedNumber() { | |
218 | + return feedNumber; | |
219 | + } | |
220 | + | |
221 | + public void setFeedNumber(String feedNumber) { | |
222 | + this.feedNumber = feedNumber; | |
223 | + } | |
224 | + | |
225 | + public Integer getNurseNumber() { | |
226 | + return nurseNumber; | |
227 | + } | |
228 | + | |
229 | + public void setNurseNumber(Integer nurseNumber) { | |
230 | + this.nurseNumber = nurseNumber; | |
231 | + } | |
232 | + | |
233 | + public String getWeight() { | |
234 | + return weight; | |
235 | + } | |
236 | + | |
237 | + public void setWeight(String weight) { | |
238 | + this.weight = weight; | |
239 | + } | |
240 | + | |
241 | + public String getHeight() { | |
242 | + return height; | |
243 | + } | |
244 | + | |
245 | + public void setHeight(String height) { | |
246 | + this.height = height; | |
247 | + } | |
248 | + | |
249 | + public boolean isVomit() { | |
250 | + return vomit; | |
251 | + } | |
252 | + | |
253 | + public void setVomit(boolean vomit) { | |
254 | + this.vomit = vomit; | |
255 | + } | |
256 | + | |
257 | + public String getShit() { | |
258 | + return shit; | |
259 | + } | |
260 | + | |
261 | + public void setShit(String shit) { | |
262 | + this.shit = shit; | |
263 | + } | |
264 | + | |
265 | + public Integer getShitNumber() { | |
266 | + return shitNumber; | |
267 | + } | |
268 | + | |
269 | + public void setShitNumber(Integer shitNumber) { | |
270 | + this.shitNumber = shitNumber; | |
271 | + } | |
272 | + | |
273 | + public String getTemperature() { | |
274 | + return temperature; | |
275 | + } | |
276 | + | |
277 | + public void setTemperature(String temperature) { | |
278 | + this.temperature = temperature; | |
279 | + } | |
280 | + | |
281 | + public String getWeightNow() { | |
282 | + return weightNow; | |
283 | + } | |
284 | + | |
285 | + public void setWeightNow(String weightNow) { | |
286 | + this.weightNow = weightNow; | |
287 | + } | |
288 | + | |
289 | + public String getHeartRate() { | |
290 | + return heartRate; | |
291 | + } | |
292 | + | |
293 | + public void setHeartRate(String heartRate) { | |
294 | + this.heartRate = heartRate; | |
295 | + } | |
296 | + | |
297 | + public String getRespiratoryRate() { | |
298 | + return respiratoryRate; | |
299 | + } | |
300 | + | |
301 | + public void setRespiratoryRate(String respiratoryRate) { | |
302 | + this.respiratoryRate = respiratoryRate; | |
303 | + } | |
304 | + | |
305 | + public String getOperationId() { | |
306 | + return operationId; | |
307 | + } | |
308 | + | |
309 | + public void setOperationId(String operationId) { | |
310 | + this.operationId = operationId; | |
311 | + } | |
312 | + | |
313 | + public String getSkin() { | |
314 | + return skin; | |
315 | + } | |
316 | + | |
317 | + public void setSkin(String skin) { | |
318 | + this.skin = skin; | |
319 | + } | |
320 | + | |
321 | + public String getComplexion() { | |
322 | + return complexion; | |
323 | + } | |
324 | + | |
325 | + public void setComplexion(String complexion) { | |
326 | + this.complexion = complexion; | |
327 | + } | |
328 | + | |
329 | + public String getIctericPart() { | |
330 | + return ictericPart; | |
331 | + } | |
332 | + | |
333 | + public void setIctericPart(String ictericPart) { | |
334 | + this.ictericPart = ictericPart; | |
335 | + } | |
336 | + | |
337 | + public String getBregmatic() { | |
338 | + return bregmatic; | |
339 | + } | |
340 | + | |
341 | + public void setBregmatic(String bregmatic) { | |
342 | + this.bregmatic = bregmatic; | |
343 | + } | |
344 | + | |
345 | + public String getUnclosedSize() { | |
346 | + return unclosedSize; | |
347 | + } | |
348 | + | |
349 | + public void setUnclosedSize(String unclosedSize) { | |
350 | + this.unclosedSize = unclosedSize; | |
351 | + } | |
352 | + | |
353 | + public String getEye() { | |
354 | + return eye; | |
355 | + } | |
356 | + | |
357 | + public void setEye(String eye) { | |
358 | + this.eye = eye; | |
359 | + } | |
360 | + | |
361 | + public String getLimb() { | |
362 | + return limb; | |
363 | + } | |
364 | + | |
365 | + public void setLimb(String limb) { | |
366 | + this.limb = limb; | |
367 | + } | |
368 | + | |
369 | + public String getEar() { | |
370 | + return ear; | |
371 | + } | |
372 | + | |
373 | + public void setEar(String ear) { | |
374 | + this.ear = ear; | |
375 | + } | |
376 | + | |
377 | + public String getNeck() { | |
378 | + return neck; | |
379 | + } | |
380 | + | |
381 | + public void setNeck(String neck) { | |
382 | + this.neck = neck; | |
383 | + } | |
384 | + | |
385 | + public String getNose() { | |
386 | + return nose; | |
387 | + } | |
388 | + | |
389 | + public void setNose(String nose) { | |
390 | + this.nose = nose; | |
391 | + } | |
392 | + | |
393 | + public String getMouth() { | |
394 | + return mouth; | |
395 | + } | |
396 | + | |
397 | + public void setMouth(String mouth) { | |
398 | + this.mouth = mouth; | |
399 | + } | |
400 | + | |
401 | + public String getGangmen() { | |
402 | + return gangmen; | |
403 | + } | |
404 | + | |
405 | + public void setGangmen(String gangmen) { | |
406 | + this.gangmen = gangmen; | |
407 | + } | |
408 | + | |
409 | + public String getHeartLung() { | |
410 | + return heartLung; | |
411 | + } | |
412 | + | |
413 | + public void setHeartLung(String heartLung) { | |
414 | + this.heartLung = heartLung; | |
415 | + } | |
416 | + | |
417 | + public String getUmbilicalCord() { | |
418 | + return umbilicalCord; | |
419 | + } | |
420 | + | |
421 | + public void setUmbilicalCord(String umbilicalCord) { | |
422 | + this.umbilicalCord = umbilicalCord; | |
423 | + } | |
424 | + | |
425 | + public String getAbdomen() { | |
426 | + return abdomen; | |
427 | + } | |
428 | + | |
429 | + public void setAbdomen(String abdomen) { | |
430 | + this.abdomen = abdomen; | |
431 | + } | |
432 | + | |
433 | + public String getSpine() { | |
434 | + return spine; | |
435 | + } | |
436 | + | |
437 | + public void setSpine(String spine) { | |
438 | + this.spine = spine; | |
439 | + } | |
440 | + | |
441 | + public String getExtGenitalia() { | |
442 | + return extGenitalia; | |
443 | + } | |
444 | + | |
445 | + public void setExtGenitalia(String extGenitalia) { | |
446 | + this.extGenitalia = extGenitalia; | |
447 | + } | |
448 | + | |
449 | + public String getDiagnosis() { | |
450 | + return diagnosis; | |
451 | + } | |
452 | + | |
453 | + public void setDiagnosis(String diagnosis) { | |
454 | + this.diagnosis = diagnosis; | |
455 | + } | |
456 | + | |
457 | + public String getHandleOpinions() { | |
458 | + return handleOpinions; | |
459 | + } | |
460 | + | |
461 | + public void setHandleOpinions(String handleOpinions) { | |
462 | + this.handleOpinions = handleOpinions; | |
463 | + } | |
464 | + | |
465 | + public String getGuidanceOpinion() { | |
466 | + return guidanceOpinion; | |
467 | + } | |
468 | + | |
469 | + public void setGuidanceOpinion(String guidanceOpinion) { | |
470 | + this.guidanceOpinion = guidanceOpinion; | |
471 | + } | |
472 | + | |
473 | + public String getDoctor() { | |
474 | + return doctor; | |
475 | + } | |
476 | + | |
477 | + public void setDoctor(String doctor) { | |
478 | + this.doctor = doctor; | |
479 | + } | |
480 | + | |
481 | + public String getVisitLocation() { | |
482 | + return visitLocation; | |
483 | + } | |
484 | + | |
485 | + public void setVisitLocation(String visitLocation) { | |
486 | + this.visitLocation = visitLocation; | |
487 | + } | |
488 | + | |
489 | + public Date getNextVisitTime() { | |
490 | + return nextVisitTime; | |
491 | + } | |
492 | + | |
493 | + public void setNextVisitTime(Date nextVisitTime) { | |
494 | + this.nextVisitTime = nextVisitTime; | |
495 | + } | |
496 | + | |
497 | + public String getNextVisitTimeDesc() { | |
498 | + return nextVisitTimeDesc; | |
499 | + } | |
500 | + | |
501 | + public void setNextVisitTimeDesc(String nextVisitTimeDesc) { | |
502 | + this.nextVisitTimeDesc = nextVisitTimeDesc; | |
503 | + } | |
504 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
View file @
dc0ef2b
1 | +package com.lyms.platform.operate.web.controller; | |
2 | + | |
3 | +import com.lyms.platform.common.base.BaseController; | |
4 | +import com.lyms.platform.common.result.BaseObjectResponse; | |
5 | +import com.lyms.platform.operate.web.service.INewbornVisitService; | |
6 | +import com.lyms.platform.pojo.NewbornVisit; | |
7 | +import org.springframework.beans.factory.annotation.Autowired; | |
8 | +import org.springframework.stereotype.Controller; | |
9 | +import org.springframework.web.bind.annotation.RequestMapping; | |
10 | +import org.springframework.web.bind.annotation.RequestMethod; | |
11 | +import org.springframework.web.bind.annotation.ResponseBody; | |
12 | + | |
13 | +import javax.servlet.http.HttpServletRequest; | |
14 | + | |
15 | +/** | |
16 | + * 新生儿访视 | |
17 | + * Created by lt on 2017/7/18 0018 | |
18 | + */ | |
19 | +@Controller("/newborn") | |
20 | +@RequestMapping | |
21 | +public class NewbornVisitControoler extends BaseController { | |
22 | + | |
23 | + @Autowired | |
24 | + private INewbornVisitService visitService; | |
25 | + | |
26 | + @RequestMapping(method = RequestMethod.POST) | |
27 | + @ResponseBody | |
28 | + public BaseObjectResponse add(HttpServletRequest request, NewbornVisit newbornVisit) { | |
29 | + return visitService.add(getUserId(request), newbornVisit); | |
30 | + } | |
31 | + | |
32 | + @RequestMapping(value = "/init", method = RequestMethod.GET) | |
33 | + @ResponseBody | |
34 | + public BaseObjectResponse init() { | |
35 | + return visitService.init(); | |
36 | + } | |
37 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
dc0ef2b
... | ... | @@ -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 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
dc0ef2b
... | ... | @@ -2645,16 +2645,16 @@ |
2645 | 2645 | List<Patients> list = patientsService.queryPatient(patientsQuery); |
2646 | 2646 | if (CollectionUtils.isNotEmpty(list)) { |
2647 | 2647 | HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), model.getBirth()); |
2648 | - List<String> listHighRisk = res.getHighRisk(); | |
2648 | + List<Map> listHighRisk = res.getHighRisk(); | |
2649 | 2649 | |
2650 | 2650 | if (CollectionUtils.isNotEmpty(listHighRisk)) { |
2651 | - if (listHighRisk.contains("健康")) { | |
2651 | + if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { | |
2652 | 2652 | result.setMommyHighRiskReason("健康"); |
2653 | 2653 | } else { |
2654 | 2654 | result.setMommyHighRiskReason("高危"); |
2655 | 2655 | } |
2656 | 2656 | } else { |
2657 | - result.setMommyHighRiskReason("健康"); | |
2657 | + result.setMommyHighRiskReason(""); | |
2658 | 2658 | } |
2659 | 2659 | } |
2660 | 2660 | |
2661 | 2661 | |
2662 | 2662 | |
... | ... | @@ -2794,16 +2794,16 @@ |
2794 | 2794 | List<Patients> list = patientsService.queryPatient(patientsQuery); |
2795 | 2795 | if (CollectionUtils.isNotEmpty(list)) { |
2796 | 2796 | HighScoreResult res = antenatalExaminationFacade.getPatLastRiskByDate(list.get(0).getPid(), false, list.get(0).getLastMenses(), babyModel.getBirth()); |
2797 | - List<String> listHighRisk = res.getHighRisk(); | |
2797 | + List<Map> listHighRisk = res.getHighRisk(); | |
2798 | 2798 | |
2799 | 2799 | if (CollectionUtils.isNotEmpty(listHighRisk)) { |
2800 | - if (listHighRisk.contains("健康")) { | |
2800 | + if (listHighRisk.size() == 1 && listHighRisk.get(0).containsValue("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) { | |
2801 | 2801 | model.setMommyHighRisk("健康"); |
2802 | 2802 | } else { |
2803 | 2803 | model.setMommyHighRisk("高危"); |
2804 | 2804 | } |
2805 | 2805 | } else { |
2806 | - model.setMommyHighRisk("健康"); | |
2806 | + model.setMommyHighRisk(""); | |
2807 | 2807 | } |
2808 | 2808 | } |
2809 | 2809 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java
View file @
dc0ef2b
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 | +import java.util.Map; | |
9 | + | |
10 | +public interface INewbornVisitService extends IBaseService { | |
11 | + | |
12 | + BaseObjectResponse init(); | |
13 | + | |
14 | + BaseObjectResponse add(Integer userId, NewbornVisit newbornVisit); | |
15 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
View file @
dc0ef2b
1 | +package com.lyms.platform.operate.web.service.impl; | |
2 | + | |
3 | +import com.alibaba.fastjson.JSON; | |
4 | +import com.lyms.hospitalapi.pojo.ReportModel; | |
5 | +import com.lyms.platform.biz.service.CommonService; | |
6 | +import com.lyms.platform.common.enums.*; | |
7 | +import com.lyms.platform.common.result.BaseObjectResponse; | |
8 | +import com.lyms.platform.common.result.PageResult; | |
9 | +import com.lyms.platform.common.result.RespBuilder; | |
10 | +import com.lyms.platform.common.utils.DateUtil; | |
11 | +import com.lyms.platform.common.utils.EnumUtil; | |
12 | +import com.lyms.platform.operate.web.dao.IReportDao; | |
13 | +import com.lyms.platform.operate.web.facade.AccessPermissionFacade; | |
14 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
15 | +import com.lyms.platform.operate.web.service.INewbornVisitService; | |
16 | +import com.lyms.platform.operate.web.service.IReportService; | |
17 | +import com.lyms.platform.operate.web.utils.*; | |
18 | +import com.lyms.platform.permission.dao.master.CouponMapper; | |
19 | +import com.lyms.platform.permission.model.Organization; | |
20 | +import com.lyms.platform.permission.model.Users; | |
21 | +import com.lyms.platform.permission.service.OrganizationService; | |
22 | +import com.lyms.platform.permission.service.UsersService; | |
23 | +import com.lyms.platform.pojo.*; | |
24 | +import com.lymsh.platform.reportdata.model.echarts.Series; | |
25 | +import org.apache.commons.collections.MapUtils; | |
26 | +import org.apache.commons.lang.StringUtils; | |
27 | +import org.springframework.beans.factory.annotation.Autowired; | |
28 | +import org.springframework.data.domain.Sort; | |
29 | +import org.springframework.data.mongodb.core.MongoTemplate; | |
30 | +import org.springframework.data.mongodb.core.query.Criteria; | |
31 | +import org.springframework.data.mongodb.core.query.Query; | |
32 | +import org.springframework.stereotype.Service; | |
33 | +import org.springframework.util.Assert; | |
34 | +import scala.Int; | |
35 | + | |
36 | +import javax.servlet.http.HttpServletResponse; | |
37 | +import java.sql.PreparedStatement; | |
38 | +import java.sql.ResultSet; | |
39 | +import java.sql.SQLException; | |
40 | +import java.util.*; | |
41 | + | |
42 | +/** | |
43 | + * @Author: litao | |
44 | + * @Date: 2017/4/19 0019 17:54 | |
45 | + * @Version: V1.0 | |
46 | + */ | |
47 | +@Service | |
48 | +public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisitService { | |
49 | + | |
50 | + @Autowired | |
51 | + private MongoTemplate mongoTemplate; | |
52 | + | |
53 | + @Override | |
54 | + public BaseObjectResponse init() { | |
55 | + List<Map<String, Object>> feedType = EnumUtil.toJson(FeedTypeEnums.class); | |
56 | + List<Map<String, Object>> skin = EnumUtil.toJson(SkinEnums.class); | |
57 | + List<Map<String, Object>> complexion = EnumUtil.toJson(ComplexionEnums.class); | |
58 | + List<Map<String, Object>> bregmatic = EnumUtil.toJson(BregmaticEnums.class); | |
59 | + List<Map<String, Object>> umbilicalCord = EnumUtil.toJson(UmbilicalCordEnums.class); | |
60 | + List<Map<String, Object>> nextVisitTime = EnumUtil.toJson(NextVisitTimeEnums.class); | |
61 | + return RespBuilder.buildSuccess("feedType", feedType, "skin", skin, "complexion", complexion | |
62 | + , "bregmatic", bregmatic, "umbilicalCord", umbilicalCord, "nextVisitTime", nextVisitTime); | |
63 | + } | |
64 | + | |
65 | + @Override | |
66 | + public BaseObjectResponse add(Integer userId, NewbornVisit newbornVisit) { | |
67 | + newbornVisit.setOperationId(userId.toString()); | |
68 | + newbornVisit.setCreated(new Date()); | |
69 | + newbornVisit.setYn("1"); | |
70 | + newbornVisit.setFeedType(newbornVisit.getFeedType() == null ? null : FeedTypeEnums.get(Integer.parseInt(newbornVisit.getFeedType())).getName()); | |
71 | + newbornVisit.setSkin(newbornVisit.getSkin() == null ? null : SkinEnums.get(Integer.parseInt(newbornVisit.getSkin())).getName()); | |
72 | + newbornVisit.setFeedType(newbornVisit.getFeedType() == null ? null : FeedTypeEnums.get(Integer.parseInt(newbornVisit.getFeedType())).getName()); | |
73 | + newbornVisit.setFeedType(newbornVisit.getFeedType() == null ? null : FeedTypeEnums.get(Integer.parseInt(newbornVisit.getFeedType())).getName()); | |
74 | + mongoTemplate.save(newbornVisit); | |
75 | + return RespBuilder.buildSuccess(); | |
76 | + } | |
77 | +} |