Commit 0469326a83050acbd2f999ec4a63de8c218be6c7
1 parent
d02041027f
Exists in
master
and in
6 other branches
优惠券相关逻辑修复
增加耳力筛查相关类
Showing 37 changed files with 2193 additions and 84 deletions
- platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarMapper.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstracUuidEntity.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstractEntity.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFamily.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarMother.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarService.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
- platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarMapper.xml
- platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
- platform-common/src/main/java/com/lyms/platform/common/result/BaseResponse.java
- platform-common/src/main/java/com/lyms/platform/common/result/PageResult.java
- platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java
- platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.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/request/BabyCheckRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractQueryRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/platform/BaseConfigConstant.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/platform/BaseConfigUtil.java
platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/BabyPatientExtendEarMapper.java
View file @
0469326
platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
View file @
0469326
1 | 1 | package com.lyms.platform.permission.dao.master; |
2 | 2 | |
3 | 3 | import com.lyms.platform.permission.model.CouponInfo; |
4 | -import com.lyms.platform.permission.model.Organization; | |
5 | 4 | |
6 | 5 | import java.util.List; |
7 | 6 | import java.util.Map; |
... | ... | @@ -29,5 +28,6 @@ |
29 | 28 | |
30 | 29 | Set<Integer> findTypes(Map<String, Object> param); |
31 | 30 | |
31 | + void update(Map<String, Object> param); | |
32 | 32 | } |
platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstracUuidEntity.java
View file @
0469326
1 | +package com.lyms.platform.permission.model; | |
2 | + | |
3 | +import java.util.UUID; | |
4 | + | |
5 | +/** | |
6 | + * uuid类型主键公共父类 | |
7 | + * @Author: litao | |
8 | + * @Date: 2017/5/12 0012 10:56 | |
9 | + * @Version: V1.0 | |
10 | + */ | |
11 | +public class AbstracUuidEntity extends AbstractEntity<String> { | |
12 | + | |
13 | + @Override | |
14 | + protected void initId() { | |
15 | + setId(UUID.randomUUID().toString().replace("-", "")); | |
16 | + } | |
17 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstractEntity.java
View file @
0469326
1 | +package com.lyms.platform.permission.model; | |
2 | + | |
3 | +import java.io.Serializable; | |
4 | + | |
5 | +/** | |
6 | + * 公共实体类 | |
7 | + * @Author: litao | |
8 | + * @Date: 2017/5/12 0012 10:44 | |
9 | + * @Version: V1.0 | |
10 | + */ | |
11 | +public abstract class AbstractEntity<PK> implements Serializable { | |
12 | + | |
13 | + private static final long serialVersionUID = 2279616455169441008L; | |
14 | + | |
15 | + /** 主键 */ | |
16 | + protected PK id; | |
17 | + | |
18 | + protected PK getId() { | |
19 | + return id; | |
20 | + } | |
21 | + | |
22 | + protected void setId(PK id) { | |
23 | + this.id = id; | |
24 | + } | |
25 | + | |
26 | + protected abstract void initId(); | |
27 | + | |
28 | + public AbstractEntity() { | |
29 | + initId(); | |
30 | + } | |
31 | + | |
32 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
View file @
0469326
1 | +package com.lyms.platform.permission.model; | |
2 | + | |
3 | +import java.util.Date; | |
4 | + | |
5 | +/** | |
6 | + * 儿童建档基本信息 | |
7 | + * @date: 2017-05-11 11:49:07 | |
8 | + */ | |
9 | +public class BabyPatientExtendEar extends AbstracUuidEntity { | |
10 | + | |
11 | + /** | |
12 | + * 儿童id | |
13 | + */ | |
14 | + private String personId; | |
15 | + | |
16 | + private Date createDate; | |
17 | + | |
18 | + private String createUserId; | |
19 | + | |
20 | + private String createHospitalId; | |
21 | + | |
22 | + private Date lastUpdateDate; | |
23 | + | |
24 | + private String lastUpdateUserId; | |
25 | + | |
26 | + private String lastUpdateHospitalId; | |
27 | + | |
28 | + /** | |
29 | + * 听力高危因素 存字典表所对应的字段 多个用逗号分割 | |
30 | + */ | |
31 | + private String highRiskCause; | |
32 | + | |
33 | + /** | |
34 | + * 状态 1=正常 -1=禁用 | |
35 | + */ | |
36 | + private Integer status; | |
37 | + | |
38 | + public String getPersonId() { | |
39 | + return personId; | |
40 | + } | |
41 | + | |
42 | + public void setPersonId(String personId) { | |
43 | + this.personId = personId; | |
44 | + } | |
45 | + public Date getCreateDate() { | |
46 | + return createDate; | |
47 | + } | |
48 | + | |
49 | + public void setCreateDate(Date createDate) { | |
50 | + this.createDate = createDate; | |
51 | + } | |
52 | + public String getCreateUserId() { | |
53 | + return createUserId; | |
54 | + } | |
55 | + | |
56 | + public void setCreateUserId(String createUserId) { | |
57 | + this.createUserId = createUserId; | |
58 | + } | |
59 | + public String getCreateHospitalId() { | |
60 | + return createHospitalId; | |
61 | + } | |
62 | + | |
63 | + public void setCreateHospitalId(String createHospitalId) { | |
64 | + this.createHospitalId = createHospitalId; | |
65 | + } | |
66 | + public Date getLastUpdateDate() { | |
67 | + return lastUpdateDate; | |
68 | + } | |
69 | + | |
70 | + public void setLastUpdateDate(Date lastUpdateDate) { | |
71 | + this.lastUpdateDate = lastUpdateDate; | |
72 | + } | |
73 | + public String getLastUpdateUserId() { | |
74 | + return lastUpdateUserId; | |
75 | + } | |
76 | + | |
77 | + public void setLastUpdateUserId(String lastUpdateUserId) { | |
78 | + this.lastUpdateUserId = lastUpdateUserId; | |
79 | + } | |
80 | + public String getLastUpdateHospitalId() { | |
81 | + return lastUpdateHospitalId; | |
82 | + } | |
83 | + | |
84 | + public void setLastUpdateHospitalId(String lastUpdateHospitalId) { | |
85 | + this.lastUpdateHospitalId = lastUpdateHospitalId; | |
86 | + } | |
87 | + public String getHighRiskCause() { | |
88 | + return highRiskCause; | |
89 | + } | |
90 | + | |
91 | + public void setHighRiskCause(String highRiskCause) { | |
92 | + this.highRiskCause = highRiskCause; | |
93 | + } | |
94 | + public Integer getStatus() { | |
95 | + return status; | |
96 | + } | |
97 | + | |
98 | + public void setStatus(Integer status) { | |
99 | + this.status = status; | |
100 | + } | |
101 | + | |
102 | + @Override | |
103 | + public String toString() { | |
104 | + StringBuilder sb = new StringBuilder(); | |
105 | + sb.append("BabyPatientExtendEar [ "); | |
106 | + sb.append("id=" + id + ","); | |
107 | + sb.append("personId=" + personId + ","); | |
108 | + sb.append("createDate=" + createDate + ","); | |
109 | + sb.append("createUserId=" + createUserId + ","); | |
110 | + sb.append("createHospitalId=" + createHospitalId + ","); | |
111 | + sb.append("lastUpdateDate=" + lastUpdateDate + ","); | |
112 | + sb.append("lastUpdateUserId=" + lastUpdateUserId + ","); | |
113 | + sb.append("lastUpdateHospitalId=" + lastUpdateHospitalId + ","); | |
114 | + sb.append("highRiskCause=" + highRiskCause + ","); | |
115 | + sb.append("status=" + status + ","); | |
116 | + sb.replace(sb.length()-1, sb.length(), " ]"); | |
117 | + return sb.toString(); | |
118 | + } | |
119 | + | |
120 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java
View file @
0469326
1 | +package com.lyms.platform.permission.model; | |
2 | + | |
3 | +import java.math.BigDecimal; | |
4 | + | |
5 | +/** | |
6 | + * 出生信息 | |
7 | + * @date: 2017-05-12 10:29:33 | |
8 | + */ | |
9 | +public class BabyPatientExtendEarBirth extends AbstracUuidEntity { | |
10 | + | |
11 | + /** | |
12 | + * 胎次 | |
13 | + */ | |
14 | + private Integer fetuNumber; | |
15 | + | |
16 | + /** | |
17 | + * 产次 | |
18 | + */ | |
19 | + private Integer productNumber; | |
20 | + | |
21 | + /** | |
22 | + * 出生体重 | |
23 | + */ | |
24 | + private BigDecimal birthWeight; | |
25 | + | |
26 | + /** | |
27 | + * 分娩方式 | |
28 | + */ | |
29 | + private Integer parturitionType; | |
30 | + | |
31 | + /** | |
32 | + * 出生缺陷类型: 1=有 -1=无 | |
33 | + */ | |
34 | + private Integer birthDefectType; | |
35 | + | |
36 | + /** | |
37 | + * 出生缺陷描述 | |
38 | + */ | |
39 | + private String birthDefectDesc; | |
40 | + | |
41 | + /** | |
42 | + * 胎儿窘迫: 1=有 -1=无 | |
43 | + */ | |
44 | + private Integer fetuEmbarrasType; | |
45 | + | |
46 | + /** | |
47 | + * 一分钟apgar评分 | |
48 | + */ | |
49 | + private BigDecimal apgarScoreOne; | |
50 | + | |
51 | + /** | |
52 | + * 五分钟apgar评分 | |
53 | + */ | |
54 | + private BigDecimal apgarScoreFive; | |
55 | + | |
56 | + /** | |
57 | + * 十分钟apgar评分 | |
58 | + */ | |
59 | + private BigDecimal apgarScoreTen; | |
60 | + | |
61 | + /** | |
62 | + * 产伤类型: 1=有 -1=无 | |
63 | + */ | |
64 | + private Integer birthInjuryType; | |
65 | + | |
66 | + /** | |
67 | + * 产伤部位 | |
68 | + */ | |
69 | + private String birthInjuryPosition; | |
70 | + | |
71 | + /** | |
72 | + * 羊水类型: 1= I度 2=II度 3=III度 | |
73 | + */ | |
74 | + private Integer amnioticFluidType; | |
75 | + | |
76 | + /** | |
77 | + * 异常分娩 1=有 -1=无 | |
78 | + */ | |
79 | + private Integer abnormalParturitionType; | |
80 | + | |
81 | + /** | |
82 | + * 异常分娩部位 | |
83 | + */ | |
84 | + private String abnormalParturitionPosition; | |
85 | + | |
86 | + /** | |
87 | + * 头颅、五观是否畸形 | |
88 | + */ | |
89 | + private Integer deformityType; | |
90 | + | |
91 | + /** | |
92 | + * 畸形部位 | |
93 | + */ | |
94 | + private String deformityPosition; | |
95 | + | |
96 | + /** | |
97 | + * 出生后感染 | |
98 | + */ | |
99 | + private Integer birthInfectionType; | |
100 | + | |
101 | + /** | |
102 | + * 感染病因 | |
103 | + */ | |
104 | + private String birthInfectionCause; | |
105 | + | |
106 | + /** | |
107 | + * 出生后感染病程 | |
108 | + */ | |
109 | + private String birthCourseDisease; | |
110 | + | |
111 | + /** | |
112 | + * 出生后患病 | |
113 | + */ | |
114 | + private Integer birthIllType; | |
115 | + | |
116 | + /** | |
117 | + * 出生后患病病因 | |
118 | + */ | |
119 | + private String birthIllCause; | |
120 | + | |
121 | + /** | |
122 | + * 出生后患病病程 | |
123 | + */ | |
124 | + private String birthIllDisease; | |
125 | + | |
126 | + /** | |
127 | + * 头部外伤史 | |
128 | + */ | |
129 | + private Integer headTraumaHistory; | |
130 | + | |
131 | + /** | |
132 | + * 头部外伤史详述 | |
133 | + */ | |
134 | + private String headTraumaDesc; | |
135 | + | |
136 | + /** | |
137 | + * 耳毒性药物应用史 | |
138 | + */ | |
139 | + private Integer earPoisonType; | |
140 | + | |
141 | + /** | |
142 | + * 药名 | |
143 | + */ | |
144 | + private String earPoisonName; | |
145 | + | |
146 | + /** | |
147 | + * 剂量 | |
148 | + */ | |
149 | + private String earPoisonNumber; | |
150 | + | |
151 | + /** | |
152 | + * 疗程 | |
153 | + */ | |
154 | + private String earPoisonCourse; | |
155 | + | |
156 | + /** | |
157 | + * 中耳炎史 | |
158 | + */ | |
159 | + private Integer tympanitisType; | |
160 | + | |
161 | + /** | |
162 | + * 中耳炎史详述 | |
163 | + */ | |
164 | + private String tympanitisDesc; | |
165 | + | |
166 | + /** | |
167 | + * 是否有nicu | |
168 | + */ | |
169 | + private Integer nicuType; | |
170 | + | |
171 | + /** | |
172 | + * nicu原因 | |
173 | + */ | |
174 | + private String nicuCause; | |
175 | + | |
176 | + /** | |
177 | + * nicu持续时间 | |
178 | + */ | |
179 | + private String nicuContinuedDate; | |
180 | + | |
181 | + /** | |
182 | + * 呼吸机使用 | |
183 | + */ | |
184 | + private Integer respiratorType; | |
185 | + | |
186 | + /** | |
187 | + * 呼吸机使用的持续时间 | |
188 | + */ | |
189 | + private String respiratorContinuedDate; | |
190 | + | |
191 | + /** | |
192 | + * 对外界声音和其他感官刺激的反应 1=灵敏 2=迟钝 | |
193 | + */ | |
194 | + private Integer outsideResponse; | |
195 | + | |
196 | + /** | |
197 | + * 所属建档的id | |
198 | + */ | |
199 | + private String babyPatientId; | |
200 | + | |
201 | + public Integer getFetuNumber() { | |
202 | + return fetuNumber; | |
203 | + } | |
204 | + | |
205 | + public void setFetuNumber(Integer fetuNumber) { | |
206 | + this.fetuNumber = fetuNumber; | |
207 | + } | |
208 | + public Integer getProductNumber() { | |
209 | + return productNumber; | |
210 | + } | |
211 | + | |
212 | + public void setProductNumber(Integer productNumber) { | |
213 | + this.productNumber = productNumber; | |
214 | + } | |
215 | + public BigDecimal getBirthWeight() { | |
216 | + return birthWeight; | |
217 | + } | |
218 | + | |
219 | + public void setBirthWeight(BigDecimal birthWeight) { | |
220 | + this.birthWeight = birthWeight; | |
221 | + } | |
222 | + public Integer getParturitionType() { | |
223 | + return parturitionType; | |
224 | + } | |
225 | + | |
226 | + public void setParturitionType(Integer parturitionType) { | |
227 | + this.parturitionType = parturitionType; | |
228 | + } | |
229 | + public Integer getBirthDefectType() { | |
230 | + return birthDefectType; | |
231 | + } | |
232 | + | |
233 | + public void setBirthDefectType(Integer birthDefectType) { | |
234 | + this.birthDefectType = birthDefectType; | |
235 | + } | |
236 | + public String getBirthDefectDesc() { | |
237 | + return birthDefectDesc; | |
238 | + } | |
239 | + | |
240 | + public void setBirthDefectDesc(String birthDefectDesc) { | |
241 | + this.birthDefectDesc = birthDefectDesc; | |
242 | + } | |
243 | + public Integer getFetuEmbarrasType() { | |
244 | + return fetuEmbarrasType; | |
245 | + } | |
246 | + | |
247 | + public void setFetuEmbarrasType(Integer fetuEmbarrasType) { | |
248 | + this.fetuEmbarrasType = fetuEmbarrasType; | |
249 | + } | |
250 | + public BigDecimal getApgarScoreOne() { | |
251 | + return apgarScoreOne; | |
252 | + } | |
253 | + | |
254 | + public void setApgarScoreOne(BigDecimal apgarScoreOne) { | |
255 | + this.apgarScoreOne = apgarScoreOne; | |
256 | + } | |
257 | + public BigDecimal getApgarScoreFive() { | |
258 | + return apgarScoreFive; | |
259 | + } | |
260 | + | |
261 | + public void setApgarScoreFive(BigDecimal apgarScoreFive) { | |
262 | + this.apgarScoreFive = apgarScoreFive; | |
263 | + } | |
264 | + public BigDecimal getApgarScoreTen() { | |
265 | + return apgarScoreTen; | |
266 | + } | |
267 | + | |
268 | + public void setApgarScoreTen(BigDecimal apgarScoreTen) { | |
269 | + this.apgarScoreTen = apgarScoreTen; | |
270 | + } | |
271 | + public Integer getBirthInjuryType() { | |
272 | + return birthInjuryType; | |
273 | + } | |
274 | + | |
275 | + public void setBirthInjuryType(Integer birthInjuryType) { | |
276 | + this.birthInjuryType = birthInjuryType; | |
277 | + } | |
278 | + public String getBirthInjuryPosition() { | |
279 | + return birthInjuryPosition; | |
280 | + } | |
281 | + | |
282 | + public void setBirthInjuryPosition(String birthInjuryPosition) { | |
283 | + this.birthInjuryPosition = birthInjuryPosition; | |
284 | + } | |
285 | + public Integer getAmnioticFluidType() { | |
286 | + return amnioticFluidType; | |
287 | + } | |
288 | + | |
289 | + public void setAmnioticFluidType(Integer amnioticFluidType) { | |
290 | + this.amnioticFluidType = amnioticFluidType; | |
291 | + } | |
292 | + public Integer getAbnormalParturitionType() { | |
293 | + return abnormalParturitionType; | |
294 | + } | |
295 | + | |
296 | + public void setAbnormalParturitionType(Integer abnormalParturitionType) { | |
297 | + this.abnormalParturitionType = abnormalParturitionType; | |
298 | + } | |
299 | + public String getAbnormalParturitionPosition() { | |
300 | + return abnormalParturitionPosition; | |
301 | + } | |
302 | + | |
303 | + public void setAbnormalParturitionPosition(String abnormalParturitionPosition) { | |
304 | + this.abnormalParturitionPosition = abnormalParturitionPosition; | |
305 | + } | |
306 | + public Integer getDeformityType() { | |
307 | + return deformityType; | |
308 | + } | |
309 | + | |
310 | + public void setDeformityType(Integer deformityType) { | |
311 | + this.deformityType = deformityType; | |
312 | + } | |
313 | + public String getDeformityPosition() { | |
314 | + return deformityPosition; | |
315 | + } | |
316 | + | |
317 | + public void setDeformityPosition(String deformityPosition) { | |
318 | + this.deformityPosition = deformityPosition; | |
319 | + } | |
320 | + public Integer getBirthInfectionType() { | |
321 | + return birthInfectionType; | |
322 | + } | |
323 | + | |
324 | + public void setBirthInfectionType(Integer birthInfectionType) { | |
325 | + this.birthInfectionType = birthInfectionType; | |
326 | + } | |
327 | + public String getBirthInfectionCause() { | |
328 | + return birthInfectionCause; | |
329 | + } | |
330 | + | |
331 | + public void setBirthInfectionCause(String birthInfectionCause) { | |
332 | + this.birthInfectionCause = birthInfectionCause; | |
333 | + } | |
334 | + public String getBirthCourseDisease() { | |
335 | + return birthCourseDisease; | |
336 | + } | |
337 | + | |
338 | + public void setBirthCourseDisease(String birthCourseDisease) { | |
339 | + this.birthCourseDisease = birthCourseDisease; | |
340 | + } | |
341 | + public Integer getBirthIllType() { | |
342 | + return birthIllType; | |
343 | + } | |
344 | + | |
345 | + public void setBirthIllType(Integer birthIllType) { | |
346 | + this.birthIllType = birthIllType; | |
347 | + } | |
348 | + public String getBirthIllCause() { | |
349 | + return birthIllCause; | |
350 | + } | |
351 | + | |
352 | + public void setBirthIllCause(String birthIllCause) { | |
353 | + this.birthIllCause = birthIllCause; | |
354 | + } | |
355 | + public String getBirthIllDisease() { | |
356 | + return birthIllDisease; | |
357 | + } | |
358 | + | |
359 | + public void setBirthIllDisease(String birthIllDisease) { | |
360 | + this.birthIllDisease = birthIllDisease; | |
361 | + } | |
362 | + public Integer getHeadTraumaHistory() { | |
363 | + return headTraumaHistory; | |
364 | + } | |
365 | + | |
366 | + public void setHeadTraumaHistory(Integer headTraumaHistory) { | |
367 | + this.headTraumaHistory = headTraumaHistory; | |
368 | + } | |
369 | + public String getHeadTraumaDesc() { | |
370 | + return headTraumaDesc; | |
371 | + } | |
372 | + | |
373 | + public void setHeadTraumaDesc(String headTraumaDesc) { | |
374 | + this.headTraumaDesc = headTraumaDesc; | |
375 | + } | |
376 | + public Integer getEarPoisonType() { | |
377 | + return earPoisonType; | |
378 | + } | |
379 | + | |
380 | + public void setEarPoisonType(Integer earPoisonType) { | |
381 | + this.earPoisonType = earPoisonType; | |
382 | + } | |
383 | + public String getEarPoisonName() { | |
384 | + return earPoisonName; | |
385 | + } | |
386 | + | |
387 | + public void setEarPoisonName(String earPoisonName) { | |
388 | + this.earPoisonName = earPoisonName; | |
389 | + } | |
390 | + public String getEarPoisonNumber() { | |
391 | + return earPoisonNumber; | |
392 | + } | |
393 | + | |
394 | + public void setEarPoisonNumber(String earPoisonNumber) { | |
395 | + this.earPoisonNumber = earPoisonNumber; | |
396 | + } | |
397 | + public String getEarPoisonCourse() { | |
398 | + return earPoisonCourse; | |
399 | + } | |
400 | + | |
401 | + public void setEarPoisonCourse(String earPoisonCourse) { | |
402 | + this.earPoisonCourse = earPoisonCourse; | |
403 | + } | |
404 | + public Integer getTympanitisType() { | |
405 | + return tympanitisType; | |
406 | + } | |
407 | + | |
408 | + public void setTympanitisType(Integer tympanitisType) { | |
409 | + this.tympanitisType = tympanitisType; | |
410 | + } | |
411 | + public String getTympanitisDesc() { | |
412 | + return tympanitisDesc; | |
413 | + } | |
414 | + | |
415 | + public void setTympanitisDesc(String tympanitisDesc) { | |
416 | + this.tympanitisDesc = tympanitisDesc; | |
417 | + } | |
418 | + public Integer getNicuType() { | |
419 | + return nicuType; | |
420 | + } | |
421 | + | |
422 | + public void setNicuType(Integer nicuType) { | |
423 | + this.nicuType = nicuType; | |
424 | + } | |
425 | + public String getNicuCause() { | |
426 | + return nicuCause; | |
427 | + } | |
428 | + | |
429 | + public void setNicuCause(String nicuCause) { | |
430 | + this.nicuCause = nicuCause; | |
431 | + } | |
432 | + public String getNicuContinuedDate() { | |
433 | + return nicuContinuedDate; | |
434 | + } | |
435 | + | |
436 | + public void setNicuContinuedDate(String nicuContinuedDate) { | |
437 | + this.nicuContinuedDate = nicuContinuedDate; | |
438 | + } | |
439 | + public Integer getRespiratorType() { | |
440 | + return respiratorType; | |
441 | + } | |
442 | + | |
443 | + public void setRespiratorType(Integer respiratorType) { | |
444 | + this.respiratorType = respiratorType; | |
445 | + } | |
446 | + public String getRespiratorContinuedDate() { | |
447 | + return respiratorContinuedDate; | |
448 | + } | |
449 | + | |
450 | + public void setRespiratorContinuedDate(String respiratorContinuedDate) { | |
451 | + this.respiratorContinuedDate = respiratorContinuedDate; | |
452 | + } | |
453 | + public Integer getOutsideResponse() { | |
454 | + return outsideResponse; | |
455 | + } | |
456 | + | |
457 | + public void setOutsideResponse(Integer outsideResponse) { | |
458 | + this.outsideResponse = outsideResponse; | |
459 | + } | |
460 | + public String getBabyPatientId() { | |
461 | + return babyPatientId; | |
462 | + } | |
463 | + | |
464 | + public void setBabyPatientId(String babyPatientId) { | |
465 | + this.babyPatientId = babyPatientId; | |
466 | + } | |
467 | + | |
468 | + @Override | |
469 | + public String toString() { | |
470 | + StringBuilder sb = new StringBuilder(); | |
471 | + sb.append("BabyPatientExtendEarBirth [ "); | |
472 | + sb.append("id=" + id + ","); | |
473 | + sb.append("fetuNumber=" + fetuNumber + ","); | |
474 | + sb.append("productNumber=" + productNumber + ","); | |
475 | + sb.append("birthWeight=" + birthWeight + ","); | |
476 | + sb.append("parturitionType=" + parturitionType + ","); | |
477 | + sb.append("birthDefectType=" + birthDefectType + ","); | |
478 | + sb.append("birthDefectDesc=" + birthDefectDesc + ","); | |
479 | + sb.append("fetuEmbarrasType=" + fetuEmbarrasType + ","); | |
480 | + sb.append("apgarScoreOne=" + apgarScoreOne + ","); | |
481 | + sb.append("apgarScoreFive=" + apgarScoreFive + ","); | |
482 | + sb.append("apgarScoreTen=" + apgarScoreTen + ","); | |
483 | + sb.append("birthInjuryType=" + birthInjuryType + ","); | |
484 | + sb.append("birthInjuryPosition=" + birthInjuryPosition + ","); | |
485 | + sb.append("amnioticFluidType=" + amnioticFluidType + ","); | |
486 | + sb.append("abnormalParturitionType=" + abnormalParturitionType + ","); | |
487 | + sb.append("abnormalParturitionPosition=" + abnormalParturitionPosition + ","); | |
488 | + sb.append("deformityType=" + deformityType + ","); | |
489 | + sb.append("deformityPosition=" + deformityPosition + ","); | |
490 | + sb.append("birthInfectionType=" + birthInfectionType + ","); | |
491 | + sb.append("birthInfectionCause=" + birthInfectionCause + ","); | |
492 | + sb.append("birthCourseDisease=" + birthCourseDisease + ","); | |
493 | + sb.append("birthIllType=" + birthIllType + ","); | |
494 | + sb.append("birthIllCause=" + birthIllCause + ","); | |
495 | + sb.append("birthIllDisease=" + birthIllDisease + ","); | |
496 | + sb.append("headTraumaHistory=" + headTraumaHistory + ","); | |
497 | + sb.append("headTraumaDesc=" + headTraumaDesc + ","); | |
498 | + sb.append("earPoisonType=" + earPoisonType + ","); | |
499 | + sb.append("earPoisonName=" + earPoisonName + ","); | |
500 | + sb.append("earPoisonNumber=" + earPoisonNumber + ","); | |
501 | + sb.append("earPoisonCourse=" + earPoisonCourse + ","); | |
502 | + sb.append("tympanitisType=" + tympanitisType + ","); | |
503 | + sb.append("tympanitisDesc=" + tympanitisDesc + ","); | |
504 | + sb.append("nicuType=" + nicuType + ","); | |
505 | + sb.append("nicuCause=" + nicuCause + ","); | |
506 | + sb.append("nicuContinuedDate=" + nicuContinuedDate + ","); | |
507 | + sb.append("respiratorType=" + respiratorType + ","); | |
508 | + sb.append("respiratorContinuedDate=" + respiratorContinuedDate + ","); | |
509 | + sb.append("outsideResponse=" + outsideResponse + ","); | |
510 | + sb.append("babyPatientId=" + babyPatientId + ","); | |
511 | + sb.replace(sb.length()-1, sb.length(), " ]"); | |
512 | + return sb.toString(); | |
513 | + } | |
514 | + | |
515 | + | |
516 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarFamily.java
View file @
0469326
1 | +package com.lyms.platform.permission.model; | |
2 | + | |
3 | +/** | |
4 | + * 家族史 | |
5 | + * @date: 2017-05-12 10:29:33 | |
6 | + */ | |
7 | +public class BabyPatientExtendEarFamily extends AbstracUuidEntity { | |
8 | + | |
9 | + /** | |
10 | + * 是否有家庭不良生活习惯 | |
11 | + */ | |
12 | + private Integer badLifeHistoryType; | |
13 | + | |
14 | + /** | |
15 | + * 庭不良生活习惯类型 1=吸烟 2=饮酒 3=吸毒 | |
16 | + */ | |
17 | + private String badLifeTypeId; | |
18 | + | |
19 | + /** | |
20 | + * 家族中是否有耳聋患者 | |
21 | + */ | |
22 | + private Integer deafType; | |
23 | + | |
24 | + /** | |
25 | + * 耳聋患者与儿童的亲属关系 | |
26 | + */ | |
27 | + private String deatRelationship; | |
28 | + | |
29 | + /** | |
30 | + * 耳聋详情 | |
31 | + */ | |
32 | + private String deafDesc; | |
33 | + | |
34 | + /** | |
35 | + * 是否近亲结婚 | |
36 | + */ | |
37 | + private Integer proximityType; | |
38 | + | |
39 | + /** | |
40 | + * 血缘关系 | |
41 | + */ | |
42 | + private String proximityRelationship; | |
43 | + | |
44 | + /** | |
45 | + * 儿童建档的主键 | |
46 | + */ | |
47 | + private String babyPatientId; | |
48 | + | |
49 | + public Integer getBadLifeHistoryType() { | |
50 | + return badLifeHistoryType; | |
51 | + } | |
52 | + | |
53 | + public void setBadLifeHistoryType(Integer badLifeHistoryType) { | |
54 | + this.badLifeHistoryType = badLifeHistoryType; | |
55 | + } | |
56 | + public String getBadLifeTypeId() { | |
57 | + return badLifeTypeId; | |
58 | + } | |
59 | + | |
60 | + public void setBadLifeTypeId(String badLifeTypeId) { | |
61 | + this.badLifeTypeId = badLifeTypeId; | |
62 | + } | |
63 | + public Integer getDeafType() { | |
64 | + return deafType; | |
65 | + } | |
66 | + | |
67 | + public void setDeafType(Integer deafType) { | |
68 | + this.deafType = deafType; | |
69 | + } | |
70 | + public String getDeatRelationship() { | |
71 | + return deatRelationship; | |
72 | + } | |
73 | + | |
74 | + public void setDeatRelationship(String deatRelationship) { | |
75 | + this.deatRelationship = deatRelationship; | |
76 | + } | |
77 | + public String getDeafDesc() { | |
78 | + return deafDesc; | |
79 | + } | |
80 | + | |
81 | + public void setDeafDesc(String deafDesc) { | |
82 | + this.deafDesc = deafDesc; | |
83 | + } | |
84 | + public Integer getProximityType() { | |
85 | + return proximityType; | |
86 | + } | |
87 | + | |
88 | + public void setProximityType(Integer proximityType) { | |
89 | + this.proximityType = proximityType; | |
90 | + } | |
91 | + public String getProximityRelationship() { | |
92 | + return proximityRelationship; | |
93 | + } | |
94 | + | |
95 | + public void setProximityRelationship(String proximityRelationship) { | |
96 | + this.proximityRelationship = proximityRelationship; | |
97 | + } | |
98 | + public String getBabyPatientId() { | |
99 | + return babyPatientId; | |
100 | + } | |
101 | + | |
102 | + public void setBabyPatientId(String babyPatientId) { | |
103 | + this.babyPatientId = babyPatientId; | |
104 | + } | |
105 | + | |
106 | + @Override | |
107 | + public String toString() { | |
108 | + StringBuilder sb = new StringBuilder(); | |
109 | + sb.append("BabyPatientExtendEarFamily [ "); | |
110 | + sb.append("id=" + id + ","); | |
111 | + sb.append("badLifeHistoryType=" + badLifeHistoryType + ","); | |
112 | + sb.append("badLifeTypeId=" + badLifeTypeId + ","); | |
113 | + sb.append("deafType=" + deafType + ","); | |
114 | + sb.append("deatRelationship=" + deatRelationship + ","); | |
115 | + sb.append("deafDesc=" + deafDesc + ","); | |
116 | + sb.append("proximityType=" + proximityType + ","); | |
117 | + sb.append("proximityRelationship=" + proximityRelationship + ","); | |
118 | + sb.append("babyPatientId=" + babyPatientId + ","); | |
119 | + sb.replace(sb.length()-1, sb.length(), " ]"); | |
120 | + return sb.toString(); | |
121 | + } | |
122 | + | |
123 | + | |
124 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarMother.java
View file @
0469326
1 | +package com.lyms.platform.permission.model; | |
2 | + | |
3 | +import java.util.Date; | |
4 | + | |
5 | +/** | |
6 | + * 儿童建档的母亲壬辰详情 | |
7 | + * @date: 2017-05-12 10:29:33 | |
8 | + */ | |
9 | +public class BabyPatientExtendEarMother extends AbstracUuidEntity { | |
10 | + | |
11 | + /** | |
12 | + * 妊娠年龄 | |
13 | + */ | |
14 | + private Integer gestationAge; | |
15 | + | |
16 | + /** | |
17 | + * 是否有流产史 1=有 -1=无 | |
18 | + */ | |
19 | + private Integer abortionHistoryType; | |
20 | + | |
21 | + /** | |
22 | + * 流产时间 | |
23 | + */ | |
24 | + private Date abortionDate; | |
25 | + | |
26 | + /** | |
27 | + * 流产原因 | |
28 | + */ | |
29 | + private String abortionCause; | |
30 | + | |
31 | + /** | |
32 | + * 流产方式 1=药物流产 | |
33 | + */ | |
34 | + private Integer abortionType; | |
35 | + | |
36 | + /** | |
37 | + * 妊娠期病毒感染史 | |
38 | + */ | |
39 | + private Integer viralInfectionHistoryType; | |
40 | + | |
41 | + /** | |
42 | + * 妊娠期病毒感染史类型:风疹 巨细胞病毒 疱疹 弓形虫 其他产考字典表 | |
43 | + */ | |
44 | + private String viralInfectionTypeId; | |
45 | + | |
46 | + /** | |
47 | + * 妊娠期病毒感染史其他类型的 描述信息 | |
48 | + */ | |
49 | + private String viralInfectionOtherDesc; | |
50 | + | |
51 | + /** | |
52 | + * 妊娠期病毒感染史的孕周数 | |
53 | + */ | |
54 | + private Integer viralInfectionDate; | |
55 | + | |
56 | + /** | |
57 | + * 妊娠期外生殖器感染史 1=有 -1=无 | |
58 | + */ | |
59 | + private Integer genitalInfectionHistoryType; | |
60 | + | |
61 | + /** | |
62 | + * 妊娠期外生殖器感染史类型 1=淋病 2=梅毒 3=尖锐湿疹 4=其他 | |
63 | + */ | |
64 | + private String genitalInfectionTypeId; | |
65 | + | |
66 | + /** | |
67 | + * 妊娠期外生殖器感染史其他类型的描述信息 | |
68 | + */ | |
69 | + private String genitalInfectionOtherDesc; | |
70 | + | |
71 | + /** | |
72 | + * 妊娠期外生殖器感染史孕周数 | |
73 | + */ | |
74 | + private Integer genitalInfectionDate; | |
75 | + | |
76 | + /** | |
77 | + * 妊娠期放射性物质接触史 | |
78 | + */ | |
79 | + private Integer radiationType; | |
80 | + | |
81 | + /** | |
82 | + * 妊娠期放射性物质接触孕周 | |
83 | + */ | |
84 | + private Date radiationDate; | |
85 | + | |
86 | + /** | |
87 | + * 妊娠期药物应用史 | |
88 | + */ | |
89 | + private Integer drugAppType; | |
90 | + | |
91 | + /** | |
92 | + * 药物名称 | |
93 | + */ | |
94 | + private String drugAppName; | |
95 | + | |
96 | + /** | |
97 | + * 用药时间 | |
98 | + */ | |
99 | + private Date drugAppUseDate; | |
100 | + | |
101 | + /** | |
102 | + * 有害物接触史 | |
103 | + */ | |
104 | + private Integer harmfulSubstanceType; | |
105 | + | |
106 | + /** | |
107 | + * 有害物的名称 | |
108 | + */ | |
109 | + private String harmfulSubstanceName; | |
110 | + | |
111 | + /** | |
112 | + * 接触有害物的时间 | |
113 | + */ | |
114 | + private Date harmfulSubstanceDate; | |
115 | + | |
116 | + /** | |
117 | + * 妊娠期不良生活习惯史 | |
118 | + */ | |
119 | + private Integer badLifeHistoryType; | |
120 | + | |
121 | + /** | |
122 | + * 妊娠期不良生活的类型 1=吸烟 2=饮酒 3=吸毒 | |
123 | + */ | |
124 | + private String badLifeTypeId; | |
125 | + | |
126 | + /** | |
127 | + * 是否有妊娠期病史 | |
128 | + */ | |
129 | + private Integer medicalHistoryType; | |
130 | + | |
131 | + /** | |
132 | + * 妊娠期病史病史类型 1=糖尿病 2=肾炎 3=甲状腺功能减退 4=败血症 5=其他 | |
133 | + */ | |
134 | + private Integer medicalTypeId; | |
135 | + | |
136 | + /** | |
137 | + * 妊娠期病史其他病史类型的描述 | |
138 | + */ | |
139 | + private String medicalOtherTypeDesc; | |
140 | + | |
141 | + /** | |
142 | + * 是否有异常妊娠 | |
143 | + */ | |
144 | + private Integer bnormalPregnancyHistoryType; | |
145 | + | |
146 | + /** | |
147 | + * 异常类型总和 1=妊高症 2=胎儿宫发育迟缓 3=母婴血型不和 4=其他 | |
148 | + */ | |
149 | + private String bnormalPregnancyTypeId; | |
150 | + | |
151 | + /** | |
152 | + * 其他类型的描述 | |
153 | + */ | |
154 | + private String bnormalPregnancyOtherDesc; | |
155 | + | |
156 | + /** | |
157 | + * 儿童建档的主键 | |
158 | + */ | |
159 | + private String babyPatientId; | |
160 | + | |
161 | + public Integer getGestationAge() { | |
162 | + return gestationAge; | |
163 | + } | |
164 | + | |
165 | + public void setGestationAge(Integer gestationAge) { | |
166 | + this.gestationAge = gestationAge; | |
167 | + } | |
168 | + public Integer getAbortionHistoryType() { | |
169 | + return abortionHistoryType; | |
170 | + } | |
171 | + | |
172 | + public void setAbortionHistoryType(Integer abortionHistoryType) { | |
173 | + this.abortionHistoryType = abortionHistoryType; | |
174 | + } | |
175 | + public Date getAbortionDate() { | |
176 | + return abortionDate; | |
177 | + } | |
178 | + | |
179 | + public void setAbortionDate(Date abortionDate) { | |
180 | + this.abortionDate = abortionDate; | |
181 | + } | |
182 | + public String getAbortionCause() { | |
183 | + return abortionCause; | |
184 | + } | |
185 | + | |
186 | + public void setAbortionCause(String abortionCause) { | |
187 | + this.abortionCause = abortionCause; | |
188 | + } | |
189 | + public Integer getAbortionType() { | |
190 | + return abortionType; | |
191 | + } | |
192 | + | |
193 | + public void setAbortionType(Integer abortionType) { | |
194 | + this.abortionType = abortionType; | |
195 | + } | |
196 | + public Integer getViralInfectionHistoryType() { | |
197 | + return viralInfectionHistoryType; | |
198 | + } | |
199 | + | |
200 | + public void setViralInfectionHistoryType(Integer viralInfectionHistoryType) { | |
201 | + this.viralInfectionHistoryType = viralInfectionHistoryType; | |
202 | + } | |
203 | + public String getViralInfectionTypeId() { | |
204 | + return viralInfectionTypeId; | |
205 | + } | |
206 | + | |
207 | + public void setViralInfectionTypeId(String viralInfectionTypeId) { | |
208 | + this.viralInfectionTypeId = viralInfectionTypeId; | |
209 | + } | |
210 | + public String getViralInfectionOtherDesc() { | |
211 | + return viralInfectionOtherDesc; | |
212 | + } | |
213 | + | |
214 | + public void setViralInfectionOtherDesc(String viralInfectionOtherDesc) { | |
215 | + this.viralInfectionOtherDesc = viralInfectionOtherDesc; | |
216 | + } | |
217 | + public Integer getViralInfectionDate() { | |
218 | + return viralInfectionDate; | |
219 | + } | |
220 | + | |
221 | + public void setViralInfectionDate(Integer viralInfectionDate) { | |
222 | + this.viralInfectionDate = viralInfectionDate; | |
223 | + } | |
224 | + public Integer getGenitalInfectionHistoryType() { | |
225 | + return genitalInfectionHistoryType; | |
226 | + } | |
227 | + | |
228 | + public void setGenitalInfectionHistoryType(Integer genitalInfectionHistoryType) { | |
229 | + this.genitalInfectionHistoryType = genitalInfectionHistoryType; | |
230 | + } | |
231 | + public String getGenitalInfectionTypeId() { | |
232 | + return genitalInfectionTypeId; | |
233 | + } | |
234 | + | |
235 | + public void setGenitalInfectionTypeId(String genitalInfectionTypeId) { | |
236 | + this.genitalInfectionTypeId = genitalInfectionTypeId; | |
237 | + } | |
238 | + public String getGenitalInfectionOtherDesc() { | |
239 | + return genitalInfectionOtherDesc; | |
240 | + } | |
241 | + | |
242 | + public void setGenitalInfectionOtherDesc(String genitalInfectionOtherDesc) { | |
243 | + this.genitalInfectionOtherDesc = genitalInfectionOtherDesc; | |
244 | + } | |
245 | + public Integer getGenitalInfectionDate() { | |
246 | + return genitalInfectionDate; | |
247 | + } | |
248 | + | |
249 | + public void setGenitalInfectionDate(Integer genitalInfectionDate) { | |
250 | + this.genitalInfectionDate = genitalInfectionDate; | |
251 | + } | |
252 | + public Integer getRadiationType() { | |
253 | + return radiationType; | |
254 | + } | |
255 | + | |
256 | + public void setRadiationType(Integer radiationType) { | |
257 | + this.radiationType = radiationType; | |
258 | + } | |
259 | + public Date getRadiationDate() { | |
260 | + return radiationDate; | |
261 | + } | |
262 | + | |
263 | + public void setRadiationDate(Date radiationDate) { | |
264 | + this.radiationDate = radiationDate; | |
265 | + } | |
266 | + public Integer getDrugAppType() { | |
267 | + return drugAppType; | |
268 | + } | |
269 | + | |
270 | + public void setDrugAppType(Integer drugAppType) { | |
271 | + this.drugAppType = drugAppType; | |
272 | + } | |
273 | + public String getDrugAppName() { | |
274 | + return drugAppName; | |
275 | + } | |
276 | + | |
277 | + public void setDrugAppName(String drugAppName) { | |
278 | + this.drugAppName = drugAppName; | |
279 | + } | |
280 | + public Date getDrugAppUseDate() { | |
281 | + return drugAppUseDate; | |
282 | + } | |
283 | + | |
284 | + public void setDrugAppUseDate(Date drugAppUseDate) { | |
285 | + this.drugAppUseDate = drugAppUseDate; | |
286 | + } | |
287 | + public Integer getHarmfulSubstanceType() { | |
288 | + return harmfulSubstanceType; | |
289 | + } | |
290 | + | |
291 | + public void setHarmfulSubstanceType(Integer harmfulSubstanceType) { | |
292 | + this.harmfulSubstanceType = harmfulSubstanceType; | |
293 | + } | |
294 | + public String getHarmfulSubstanceName() { | |
295 | + return harmfulSubstanceName; | |
296 | + } | |
297 | + | |
298 | + public void setHarmfulSubstanceName(String harmfulSubstanceName) { | |
299 | + this.harmfulSubstanceName = harmfulSubstanceName; | |
300 | + } | |
301 | + public Date getHarmfulSubstanceDate() { | |
302 | + return harmfulSubstanceDate; | |
303 | + } | |
304 | + | |
305 | + public void setHarmfulSubstanceDate(Date harmfulSubstanceDate) { | |
306 | + this.harmfulSubstanceDate = harmfulSubstanceDate; | |
307 | + } | |
308 | + public Integer getBadLifeHistoryType() { | |
309 | + return badLifeHistoryType; | |
310 | + } | |
311 | + | |
312 | + public void setBadLifeHistoryType(Integer badLifeHistoryType) { | |
313 | + this.badLifeHistoryType = badLifeHistoryType; | |
314 | + } | |
315 | + public String getBadLifeTypeId() { | |
316 | + return badLifeTypeId; | |
317 | + } | |
318 | + | |
319 | + public void setBadLifeTypeId(String badLifeTypeId) { | |
320 | + this.badLifeTypeId = badLifeTypeId; | |
321 | + } | |
322 | + public Integer getMedicalHistoryType() { | |
323 | + return medicalHistoryType; | |
324 | + } | |
325 | + | |
326 | + public void setMedicalHistoryType(Integer medicalHistoryType) { | |
327 | + this.medicalHistoryType = medicalHistoryType; | |
328 | + } | |
329 | + public Integer getMedicalTypeId() { | |
330 | + return medicalTypeId; | |
331 | + } | |
332 | + | |
333 | + public void setMedicalTypeId(Integer medicalTypeId) { | |
334 | + this.medicalTypeId = medicalTypeId; | |
335 | + } | |
336 | + public String getMedicalOtherTypeDesc() { | |
337 | + return medicalOtherTypeDesc; | |
338 | + } | |
339 | + | |
340 | + public void setMedicalOtherTypeDesc(String medicalOtherTypeDesc) { | |
341 | + this.medicalOtherTypeDesc = medicalOtherTypeDesc; | |
342 | + } | |
343 | + public Integer getBnormalPregnancyHistoryType() { | |
344 | + return bnormalPregnancyHistoryType; | |
345 | + } | |
346 | + | |
347 | + public void setBnormalPregnancyHistoryType(Integer bnormalPregnancyHistoryType) { | |
348 | + this.bnormalPregnancyHistoryType = bnormalPregnancyHistoryType; | |
349 | + } | |
350 | + public String getBnormalPregnancyTypeId() { | |
351 | + return bnormalPregnancyTypeId; | |
352 | + } | |
353 | + | |
354 | + public void setBnormalPregnancyTypeId(String bnormalPregnancyTypeId) { | |
355 | + this.bnormalPregnancyTypeId = bnormalPregnancyTypeId; | |
356 | + } | |
357 | + public String getBnormalPregnancyOtherDesc() { | |
358 | + return bnormalPregnancyOtherDesc; | |
359 | + } | |
360 | + | |
361 | + public void setBnormalPregnancyOtherDesc(String bnormalPregnancyOtherDesc) { | |
362 | + this.bnormalPregnancyOtherDesc = bnormalPregnancyOtherDesc; | |
363 | + } | |
364 | + public String getBabyPatientId() { | |
365 | + return babyPatientId; | |
366 | + } | |
367 | + | |
368 | + public void setBabyPatientId(String babyPatientId) { | |
369 | + this.babyPatientId = babyPatientId; | |
370 | + } | |
371 | + | |
372 | + @Override | |
373 | + public String toString() { | |
374 | + StringBuilder sb = new StringBuilder(); | |
375 | + sb.append("BabyPatientExtendEarMother [ "); | |
376 | + sb.append("id=" + id + ","); | |
377 | + sb.append("gestationAge=" + gestationAge + ","); | |
378 | + sb.append("abortionHistoryType=" + abortionHistoryType + ","); | |
379 | + sb.append("abortionDate=" + abortionDate + ","); | |
380 | + sb.append("abortionCause=" + abortionCause + ","); | |
381 | + sb.append("abortionType=" + abortionType + ","); | |
382 | + sb.append("viralInfectionHistoryType=" + viralInfectionHistoryType + ","); | |
383 | + sb.append("viralInfectionTypeId=" + viralInfectionTypeId + ","); | |
384 | + sb.append("viralInfectionOtherDesc=" + viralInfectionOtherDesc + ","); | |
385 | + sb.append("viralInfectionDate=" + viralInfectionDate + ","); | |
386 | + sb.append("genitalInfectionHistoryType=" + genitalInfectionHistoryType + ","); | |
387 | + sb.append("genitalInfectionTypeId=" + genitalInfectionTypeId + ","); | |
388 | + sb.append("genitalInfectionOtherDesc=" + genitalInfectionOtherDesc + ","); | |
389 | + sb.append("genitalInfectionDate=" + genitalInfectionDate + ","); | |
390 | + sb.append("radiationType=" + radiationType + ","); | |
391 | + sb.append("radiationDate=" + radiationDate + ","); | |
392 | + sb.append("drugAppType=" + drugAppType + ","); | |
393 | + sb.append("drugAppName=" + drugAppName + ","); | |
394 | + sb.append("drugAppUseDate=" + drugAppUseDate + ","); | |
395 | + sb.append("harmfulSubstanceType=" + harmfulSubstanceType + ","); | |
396 | + sb.append("harmfulSubstanceName=" + harmfulSubstanceName + ","); | |
397 | + sb.append("harmfulSubstanceDate=" + harmfulSubstanceDate + ","); | |
398 | + sb.append("badLifeHistoryType=" + badLifeHistoryType + ","); | |
399 | + sb.append("badLifeTypeId=" + badLifeTypeId + ","); | |
400 | + sb.append("medicalHistoryType=" + medicalHistoryType + ","); | |
401 | + sb.append("medicalTypeId=" + medicalTypeId + ","); | |
402 | + sb.append("medicalOtherTypeDesc=" + medicalOtherTypeDesc + ","); | |
403 | + sb.append("bnormalPregnancyHistoryType=" + bnormalPregnancyHistoryType + ","); | |
404 | + sb.append("bnormalPregnancyTypeId=" + bnormalPregnancyTypeId + ","); | |
405 | + sb.append("bnormalPregnancyOtherDesc=" + bnormalPregnancyOtherDesc + ","); | |
406 | + sb.append("babyPatientId=" + babyPatientId + ","); | |
407 | + sb.replace(sb.length()-1, sb.length(), " ]"); | |
408 | + return sb.toString(); | |
409 | + } | |
410 | + | |
411 | + | |
412 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarScreen.java
View file @
0469326
1 | +package com.lyms.platform.permission.model; | |
2 | + | |
3 | +import java.util.Date; | |
4 | + | |
5 | +/** | |
6 | + * 听力筛查 | |
7 | + * @date: 2017-05-12 10:29:33 | |
8 | + */ | |
9 | +public class BabyPatientExtendEarScreen extends AbstracUuidEntity { | |
10 | + | |
11 | + private String babyId; | |
12 | + | |
13 | + /** | |
14 | + * 筛查类型 1=初筛 2=复筛 | |
15 | + */ | |
16 | + private Integer screenType; | |
17 | + | |
18 | + /** | |
19 | + * 检查医院的id | |
20 | + */ | |
21 | + private String checkHospitalId; | |
22 | + | |
23 | + /** | |
24 | + * 筛查时间 | |
25 | + */ | |
26 | + private Date screenDate; | |
27 | + | |
28 | + /** | |
29 | + * 高危因素 1=早产 2=晚产 | |
30 | + */ | |
31 | + private Integer highRiskCause; | |
32 | + | |
33 | + /** | |
34 | + * 左耳检查结果 1=通过 -1=未通过 | |
35 | + */ | |
36 | + private Integer oaeLeft; | |
37 | + | |
38 | + /** | |
39 | + * 右耳检查结果 1=通过 -1=未通过 | |
40 | + */ | |
41 | + private Integer oaeRight; | |
42 | + | |
43 | + /** | |
44 | + * 听力基因GJB2-35 del G 的值 1=野生型 | |
45 | + */ | |
46 | + private Integer gjb2Del35; | |
47 | + | |
48 | + private Integer gjb2Del176; | |
49 | + | |
50 | + private Integer gjb2Del235; | |
51 | + | |
52 | + private Integer gjb2Del299; | |
53 | + | |
54 | + private Integer gjb3Slc26a4538; | |
55 | + | |
56 | + private Integer gjb3Slc26a42168; | |
57 | + | |
58 | + private Integer gjb3Slc26a4Ivs7; | |
59 | + | |
60 | + /** | |
61 | + * 处理意见 1=复筛 2=诊断 | |
62 | + */ | |
63 | + private Integer processOptionType; | |
64 | + | |
65 | + /** | |
66 | + * 处理意见 描述信息 | |
67 | + */ | |
68 | + private String processOptionDesc; | |
69 | + | |
70 | + /** | |
71 | + * 指导意见 | |
72 | + */ | |
73 | + private String guidOpinion; | |
74 | + | |
75 | + /** | |
76 | + * 检查医生 | |
77 | + */ | |
78 | + private String checkDoctorId; | |
79 | + | |
80 | + /** | |
81 | + * 诊断时间 | |
82 | + */ | |
83 | + private Date referralDate; | |
84 | + | |
85 | + public String getBabyId() { | |
86 | + return babyId; | |
87 | + } | |
88 | + | |
89 | + public void setBabyId(String babyId) { | |
90 | + this.babyId = babyId; | |
91 | + } | |
92 | + public Integer getScreenType() { | |
93 | + return screenType; | |
94 | + } | |
95 | + | |
96 | + public void setScreenType(Integer screenType) { | |
97 | + this.screenType = screenType; | |
98 | + } | |
99 | + public String getCheckHospitalId() { | |
100 | + return checkHospitalId; | |
101 | + } | |
102 | + | |
103 | + public void setCheckHospitalId(String checkHospitalId) { | |
104 | + this.checkHospitalId = checkHospitalId; | |
105 | + } | |
106 | + public Date getScreenDate() { | |
107 | + return screenDate; | |
108 | + } | |
109 | + | |
110 | + public void setScreenDate(Date screenDate) { | |
111 | + this.screenDate = screenDate; | |
112 | + } | |
113 | + public Integer getHighRiskCause() { | |
114 | + return highRiskCause; | |
115 | + } | |
116 | + | |
117 | + public void setHighRiskCause(Integer highRiskCause) { | |
118 | + this.highRiskCause = highRiskCause; | |
119 | + } | |
120 | + public Integer getOaeLeft() { | |
121 | + return oaeLeft; | |
122 | + } | |
123 | + | |
124 | + public void setOaeLeft(Integer oaeLeft) { | |
125 | + this.oaeLeft = oaeLeft; | |
126 | + } | |
127 | + public Integer getOaeRight() { | |
128 | + return oaeRight; | |
129 | + } | |
130 | + | |
131 | + public void setOaeRight(Integer oaeRight) { | |
132 | + this.oaeRight = oaeRight; | |
133 | + } | |
134 | + public Integer getGjb2Del35() { | |
135 | + return gjb2Del35; | |
136 | + } | |
137 | + | |
138 | + public void setGjb2Del35(Integer gjb2Del35) { | |
139 | + this.gjb2Del35 = gjb2Del35; | |
140 | + } | |
141 | + public Integer getGjb2Del176() { | |
142 | + return gjb2Del176; | |
143 | + } | |
144 | + | |
145 | + public void setGjb2Del176(Integer gjb2Del176) { | |
146 | + this.gjb2Del176 = gjb2Del176; | |
147 | + } | |
148 | + public Integer getGjb2Del235() { | |
149 | + return gjb2Del235; | |
150 | + } | |
151 | + | |
152 | + public void setGjb2Del235(Integer gjb2Del235) { | |
153 | + this.gjb2Del235 = gjb2Del235; | |
154 | + } | |
155 | + public Integer getGjb2Del299() { | |
156 | + return gjb2Del299; | |
157 | + } | |
158 | + | |
159 | + public void setGjb2Del299(Integer gjb2Del299) { | |
160 | + this.gjb2Del299 = gjb2Del299; | |
161 | + } | |
162 | + public Integer getGjb3Slc26a4538() { | |
163 | + return gjb3Slc26a4538; | |
164 | + } | |
165 | + | |
166 | + public void setGjb3Slc26a4538(Integer gjb3Slc26a4538) { | |
167 | + this.gjb3Slc26a4538 = gjb3Slc26a4538; | |
168 | + } | |
169 | + public Integer getGjb3Slc26a42168() { | |
170 | + return gjb3Slc26a42168; | |
171 | + } | |
172 | + | |
173 | + public void setGjb3Slc26a42168(Integer gjb3Slc26a42168) { | |
174 | + this.gjb3Slc26a42168 = gjb3Slc26a42168; | |
175 | + } | |
176 | + public Integer getGjb3Slc26a4Ivs7() { | |
177 | + return gjb3Slc26a4Ivs7; | |
178 | + } | |
179 | + | |
180 | + public void setGjb3Slc26a4Ivs7(Integer gjb3Slc26a4Ivs7) { | |
181 | + this.gjb3Slc26a4Ivs7 = gjb3Slc26a4Ivs7; | |
182 | + } | |
183 | + public Integer getProcessOptionType() { | |
184 | + return processOptionType; | |
185 | + } | |
186 | + | |
187 | + public void setProcessOptionType(Integer processOptionType) { | |
188 | + this.processOptionType = processOptionType; | |
189 | + } | |
190 | + public String getProcessOptionDesc() { | |
191 | + return processOptionDesc; | |
192 | + } | |
193 | + | |
194 | + public void setProcessOptionDesc(String processOptionDesc) { | |
195 | + this.processOptionDesc = processOptionDesc; | |
196 | + } | |
197 | + public String getGuidOpinion() { | |
198 | + return guidOpinion; | |
199 | + } | |
200 | + | |
201 | + public void setGuidOpinion(String guidOpinion) { | |
202 | + this.guidOpinion = guidOpinion; | |
203 | + } | |
204 | + public String getCheckDoctorId() { | |
205 | + return checkDoctorId; | |
206 | + } | |
207 | + | |
208 | + public void setCheckDoctorId(String checkDoctorId) { | |
209 | + this.checkDoctorId = checkDoctorId; | |
210 | + } | |
211 | + public Date getReferralDate() { | |
212 | + return referralDate; | |
213 | + } | |
214 | + | |
215 | + public void setReferralDate(Date referralDate) { | |
216 | + this.referralDate = referralDate; | |
217 | + } | |
218 | + | |
219 | + @Override | |
220 | + public String toString() { | |
221 | + StringBuilder sb = new StringBuilder(); | |
222 | + sb.append("BabyPatientExtendEarScreen [ "); | |
223 | + sb.append("id=" + id + ","); | |
224 | + sb.append("babyId=" + babyId + ","); | |
225 | + sb.append("screenType=" + screenType + ","); | |
226 | + sb.append("checkHospitalId=" + checkHospitalId + ","); | |
227 | + sb.append("screenDate=" + screenDate + ","); | |
228 | + sb.append("highRiskCause=" + highRiskCause + ","); | |
229 | + sb.append("oaeLeft=" + oaeLeft + ","); | |
230 | + sb.append("oaeRight=" + oaeRight + ","); | |
231 | + sb.append("gjb2Del35=" + gjb2Del35 + ","); | |
232 | + sb.append("gjb2Del176=" + gjb2Del176 + ","); | |
233 | + sb.append("gjb2Del235=" + gjb2Del235 + ","); | |
234 | + sb.append("gjb2Del299=" + gjb2Del299 + ","); | |
235 | + sb.append("gjb3Slc26a4538=" + gjb3Slc26a4538 + ","); | |
236 | + sb.append("gjb3Slc26a42168=" + gjb3Slc26a42168 + ","); | |
237 | + sb.append("gjb3Slc26a4Ivs7=" + gjb3Slc26a4Ivs7 + ","); | |
238 | + sb.append("processOptionType=" + processOptionType + ","); | |
239 | + sb.append("processOptionDesc=" + processOptionDesc + ","); | |
240 | + sb.append("guidOpinion=" + guidOpinion + ","); | |
241 | + sb.append("checkDoctorId=" + checkDoctorId + ","); | |
242 | + sb.append("referralDate=" + referralDate + ","); | |
243 | + sb.replace(sb.length()-1, sb.length(), " ]"); | |
244 | + return sb.toString(); | |
245 | + } | |
246 | + | |
247 | + | |
248 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/BabyPatientExtendEarService.java
View file @
0469326
1 | +package com.lyms.platform.permission.service; | |
2 | + | |
3 | +import com.lyms.platform.common.result.BaseObjectResponse; | |
4 | +import com.lyms.platform.permission.model.BabyPatientExtendEar; | |
5 | +import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; | |
6 | +import com.lyms.platform.permission.model.BabyPatientExtendEarFamily; | |
7 | +import com.lyms.platform.permission.model.BabyPatientExtendEarMother; | |
8 | + | |
9 | +public interface BabyPatientExtendEarService { | |
10 | + | |
11 | + BaseObjectResponse insert(BabyPatientExtendEar ear, BabyPatientExtendEarBirth earBirth, BabyPatientExtendEarMother earMother, BabyPatientExtendEarFamily earFamily, Integer userId); | |
12 | + | |
13 | + BaseObjectResponse getConfigs(); | |
14 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java
View file @
0469326
... | ... | @@ -15,7 +15,7 @@ |
15 | 15 | |
16 | 16 | BaseObjectResponse validate(String code, Integer type, String hospitalId); |
17 | 17 | |
18 | - BaseObjectResponse findList(String userId, String hospitalId, String url); | |
18 | + BaseObjectResponse findList(String userId, String hospitalId); | |
19 | 19 | |
20 | 20 | BaseObjectResponse use(String hospitalId, String code, Integer userId); |
21 | 21 | |
... | ... | @@ -24,5 +24,7 @@ |
24 | 24 | Map<String, Object> getPatientsInfo(String userId); |
25 | 25 | |
26 | 26 | Map<String, Object> getPatientsInfoByCode(String code); |
27 | + | |
28 | + void del(String userId, String hospitalId, String delUserId); | |
27 | 29 | } |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java
View file @
0469326
1 | +package com.lyms.platform.permission.service.impl; | |
2 | + | |
3 | +import com.lyms.platform.common.result.BaseObjectResponse; | |
4 | +import com.lyms.platform.common.result.RespBuilder; | |
5 | +import com.lyms.platform.permission.dao.master.BabyPatientExtendEarMapper; | |
6 | +import com.lyms.platform.permission.model.BabyPatientExtendEar; | |
7 | +import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; | |
8 | +import com.lyms.platform.permission.model.BabyPatientExtendEarFamily; | |
9 | +import com.lyms.platform.permission.model.BabyPatientExtendEarMother; | |
10 | +import com.lyms.platform.permission.service.BabyPatientExtendEarService; | |
11 | +import org.springframework.beans.factory.annotation.Autowired; | |
12 | +import org.springframework.data.mongodb.core.MongoTemplate; | |
13 | +import org.springframework.stereotype.Service; | |
14 | + | |
15 | +@Service | |
16 | +public class BabyPatientExtendEarServiceImpl implements BabyPatientExtendEarService { | |
17 | + | |
18 | + @Autowired | |
19 | + private MongoTemplate mongoTemplate; | |
20 | + | |
21 | + @Autowired | |
22 | + private BabyPatientExtendEarMapper earMapper; | |
23 | + | |
24 | + @Override | |
25 | + public BaseObjectResponse insert(BabyPatientExtendEar ear, BabyPatientExtendEarBirth earBirth, | |
26 | + BabyPatientExtendEarMother earMother, BabyPatientExtendEarFamily earFamily, Integer userId) { | |
27 | + System.out.println("ear = [" + ear + "], earBirth = [" + earBirth + "], earMother = [" + earMother + "], earFamily = [" + earFamily + "], userId = [" + userId + "]"); | |
28 | + return RespBuilder.buildSuccess(); | |
29 | + } | |
30 | + | |
31 | + @Override | |
32 | + public BaseObjectResponse getConfigs() { | |
33 | + return null; | |
34 | + } | |
35 | +} |
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
View file @
0469326
... | ... | @@ -18,6 +18,7 @@ |
18 | 18 | import org.slf4j.Logger; |
19 | 19 | import org.slf4j.LoggerFactory; |
20 | 20 | import org.springframework.beans.factory.annotation.Autowired; |
21 | +import org.springframework.beans.factory.annotation.Value; | |
21 | 22 | import org.springframework.data.domain.Sort; |
22 | 23 | import org.springframework.data.mongodb.core.MongoTemplate; |
23 | 24 | import org.springframework.data.mongodb.core.query.Criteria; |
... | ... | @@ -36,6 +37,9 @@ |
36 | 37 | |
37 | 38 | private Logger logger = LoggerFactory.getLogger(CouponServiceImpl.class); |
38 | 39 | |
40 | + @Value("${or.code.url}") | |
41 | + private String url; | |
42 | + | |
39 | 43 | /** 1 = 孕妇 */ |
40 | 44 | private static final String PREGNANT_WOMAN = "1"; |
41 | 45 | |
... | ... | @@ -70,7 +74,7 @@ |
70 | 74 | * 生成规则: |
71 | 75 | * 孕妇 建档、产检、分娩、出院小结、产后复查 |
72 | 76 | * 产妇 建档、出院小结、产后复查 |
73 | - * 产妇没有分娩记录且没有出院小结: 分娩、出院小结、产后复查 | |
77 | + * 产妇没有分娩记录且没有出院小结: 分娩、出院小结、产后复查、建档券 | |
74 | 78 | * 产妇有分娩记录且没有出院小结: 出院小结、产后复查 |
75 | 79 | * 产妇有分娩记录且有出院小结: 产后复查 |
76 | 80 | * 儿童 建档、儿童保健 |
... | ... | @@ -82,7 +86,7 @@ |
82 | 86 | { |
83 | 87 | put(PREGNANT_WOMAN, Arrays.asList(1, 2, 4, 5, 6)); |
84 | 88 | put(CHILDREN, Arrays.asList(7, 8)); |
85 | - put(MATERNAL_NCHILDBIRTH_NHOSPITAL, Arrays.asList(4, 5, 6)); | |
89 | + put(MATERNAL_NCHILDBIRTH_NHOSPITAL, Arrays.asList(3, 4, 5, 6)); | |
86 | 90 | put(MATERNAL_YCHILDBIRTH_NHOSPITAL, Arrays.asList(5, 6)); |
87 | 91 | put(MATERNAL_YCHILDBIRTH_YHOSPITAL, Arrays.asList(6)); |
88 | 92 | put(PUT_ON_RECORD, Arrays.asList(1, 3, 7)); |
... | ... | @@ -144,7 +148,14 @@ |
144 | 148 | if(type != null && typeMap.get(PUT_ON_RECORD).contains(Integer.parseInt(type.toString()))) { |
145 | 149 | couponInfo.setStatus(2); |
146 | 150 | Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), Patients.class); |
147 | - if(patients != null) { | |
151 | + if(patients == null) { /** 不是孕妇就是儿童 */ | |
152 | + BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), BabyModel.class); | |
153 | + if(baby != null) { | |
154 | + couponInfo.setUseDate(baby.getBuildDate()); | |
155 | + couponInfo.setOperatorUseId(baby.getBuildDoctor()); | |
156 | + couponInfo.setUsedHospitalId(baby.getHospitalId()); | |
157 | + } | |
158 | + } else if(patients != null){ | |
148 | 159 | couponInfo.setUseDate(patients.getBookbuildingDate()); |
149 | 160 | couponInfo.setOperatorUseId(patients.getBookbuildingDoctor()); |
150 | 161 | couponInfo.setUsedHospitalId(patients.getHospitalId()); |
... | ... | @@ -284,6 +295,24 @@ |
284 | 295 | return null; |
285 | 296 | } |
286 | 297 | |
298 | + /** | |
299 | + * 当删除孕妇或儿童档案时,默认修改该孕妇和儿童下所有的优惠券为已删除的状态 | |
300 | + * 操作人为当前登陆人的id | |
301 | + * @param userId 登陆人的id | |
302 | + * @param hospitalId 医院id | |
303 | + * @param delUserId 被删除优惠券人的id | |
304 | + */ | |
305 | + @Override | |
306 | + public void del(String userId, String hospitalId, String delUserId) { | |
307 | + Map<String, Object> param = new HashMap<>(); | |
308 | + param.put("hospitalId", hospitalId); | |
309 | + param.put("operatorUseId", userId); | |
310 | + param.put("status", 2); | |
311 | + param.put("useDate", new Date()); | |
312 | + param.put("userId", delUserId); | |
313 | + couponMapper.update(param); | |
314 | + } | |
315 | + | |
287 | 316 | /** 1=省 2=市 3=区 4=单医院 */ |
288 | 317 | private boolean validateArea(String areaType, String createHospitalId, String useHospitald) { |
289 | 318 | Organization createHospital = organizationService.getOrganization(Integer.parseInt(createHospitalId)); |
290 | 319 | |
291 | 320 | |
292 | 321 | |
... | ... | @@ -323,18 +352,22 @@ |
323 | 352 | Date midDate = null; |
324 | 353 | Date startDate = null; |
325 | 354 | Date endDate = null; |
326 | -// if(couponType == 1) {/** 根据末次月经对比 midDate = 末次月经时间 */ | |
327 | 355 | if(typeMap.get(PREGNANT_WOMAN).contains(couponType)) {/** 孕妇: 根据末次月经对比 midDate = 末次月经时间 */ |
328 | 356 | List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("type").is(1).and("hospitalId").is(hospitalId).and("pid").is(userId)), Patients.class); |
329 | 357 | if(CollectionUtils.isEmpty(patients)) { |
330 | - logger.info("未找到pid: " + userId + ", hospitalId: " + hospitalId + ", type: 1 的孕妇信息"); | |
331 | - return false; | |
358 | + BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), BabyModel.class); | |
359 | + if(baby != null) {/** 孕妇没查到就查儿童 */ | |
360 | + midDate = baby.getBirth(); | |
361 | + } else { | |
362 | + logger.info("未找到pid: " + userId + ", hospitalId: " + hospitalId + ", type: 1 的信息"); | |
363 | + return false; | |
364 | + } | |
332 | 365 | } |
333 | 366 | midDate = patients.get(0).getLastMenses(); |
334 | -// } else if(couponType == 2 || couponType == 3) {/** 根据分娩时间对比 midDate = 分娩时间 */ | |
335 | 367 | } else {/** 产妇或者儿童:根据分娩时间对比 midDate = 分娩时间 */ |
336 | 368 | List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("type").is(3).and("hospitalId").is(hospitalId).and("pid").is(userId)) |
337 | 369 | .with(new Sort(Sort.Direction.DESC, "fmDate")), Patients.class); |
370 | + | |
338 | 371 | if(CollectionUtils.isEmpty(patients)) { |
339 | 372 | logger.info("未找到pid: " + userId + ", hospitalId: " + hospitalId + ", type: 3 的孕妇信息"); |
340 | 373 | return false; |
... | ... | @@ -353,7 +386,8 @@ |
353 | 386 | startDate = DateUtils.addMonths(midDate, start); |
354 | 387 | endDate = DateUtils.addMonths(midDate, end + 1); |
355 | 388 | } |
356 | - if(DateUtil.isBetween(midDate, startDate, endDate)) { | |
389 | +// if(DateUtil.isBetween(midDate, startDate, endDate)) { | |
390 | + if(DateUtil.isBetween(new Date(), startDate, endDate)) { | |
357 | 391 | return true; |
358 | 392 | } |
359 | 393 | } |
... | ... | @@ -361,7 +395,7 @@ |
361 | 395 | } |
362 | 396 | |
363 | 397 | @Override |
364 | - public BaseObjectResponse findList(String userId, String hospitalId, String url) { | |
398 | + public BaseObjectResponse findList(String userId, String hospitalId) { | |
365 | 399 | Map<String, Object> param = new HashMap<>(); |
366 | 400 | param.put("userId", userId); |
367 | 401 | param.put("hospitalId", hospitalId); |
platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarMapper.xml
View file @
0469326
1 | +<?xml version="1.0" encoding="UTF-8"?> | |
2 | +<!DOCTYPE mapper | |
3 | + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | |
4 | + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | |
5 | +<mapper namespace="com.lyms.platform.permission.dao.master.BabyPatientExtendEarMapper"> | |
6 | + | |
7 | + <resultMap type="com.lyms.platform.permission.model.BabyPatientExtendEar" id="babyPatientExtendEarMap"> | |
8 | + <result column="id" property="id"/> | |
9 | + <result column="person_id" property="personId"/> | |
10 | + <result column="create_date" property="createDate"/> | |
11 | + <result column="create_user_id" property="createUserId"/> | |
12 | + <result column="create_hospital_id" property="createHospitalId"/> | |
13 | + <result column="last_update_date" property="lastUpdateDate"/> | |
14 | + <result column="last_update_user_id" property="lastUpdateUserId"/> | |
15 | + <result column="last_update_hospital_id" property="lastUpdateHospitalId"/> | |
16 | + <result column="high_risk_cause" property="highRiskCause"/> | |
17 | + <result column="status" property="status"/> | |
18 | + </resultMap> | |
19 | + | |
20 | + <sql id="columnList"> | |
21 | + person_id,create_date,create_user_id,create_hospital_id,last_update_date,last_update_user_id,last_update_hospital_id,high_risk_cause,status | |
22 | + </sql> | |
23 | + | |
24 | + <sql id="columnWhere"> | |
25 | + <where> | |
26 | + <if test="id != null"> | |
27 | + and id = #{id} | |
28 | + </if> | |
29 | + <if test="personId != null"> | |
30 | + and person_id = #{personId} | |
31 | + </if> | |
32 | + <if test="createDate != null"> | |
33 | + and create_date = #{createDate} | |
34 | + </if> | |
35 | + <if test="createUserId != null"> | |
36 | + and create_user_id = #{createUserId} | |
37 | + </if> | |
38 | + <if test="createHospitalId != null"> | |
39 | + and create_hospital_id = #{createHospitalId} | |
40 | + </if> | |
41 | + <if test="lastUpdateDate != null"> | |
42 | + and last_update_date = #{lastUpdateDate} | |
43 | + </if> | |
44 | + <if test="lastUpdateUserId != null"> | |
45 | + and last_update_user_id = #{lastUpdateUserId} | |
46 | + </if> | |
47 | + <if test="lastUpdateHospitalId != null"> | |
48 | + and last_update_hospital_id = #{lastUpdateHospitalId} | |
49 | + </if> | |
50 | + <if test="highRiskCause != null"> | |
51 | + and high_risk_cause = #{highRiskCause} | |
52 | + </if> | |
53 | + <if test="status != null"> | |
54 | + and status = #{status} | |
55 | + </if> | |
56 | + </where> | |
57 | + </sql> | |
58 | + | |
59 | + <sql id="columnUpdate"> | |
60 | + <set> | |
61 | + <if test="personId != null"> | |
62 | + person_id = #{personId}, | |
63 | + </if> | |
64 | + <if test="createDate != null"> | |
65 | + create_date = #{createDate}, | |
66 | + </if> | |
67 | + <if test="createUserId != null"> | |
68 | + create_user_id = #{createUserId}, | |
69 | + </if> | |
70 | + <if test="createHospitalId != null"> | |
71 | + create_hospital_id = #{createHospitalId}, | |
72 | + </if> | |
73 | + <if test="lastUpdateDate != null"> | |
74 | + last_update_date = #{lastUpdateDate}, | |
75 | + </if> | |
76 | + <if test="lastUpdateUserId != null"> | |
77 | + last_update_user_id = #{lastUpdateUserId}, | |
78 | + </if> | |
79 | + <if test="lastUpdateHospitalId != null"> | |
80 | + last_update_hospital_id = #{lastUpdateHospitalId}, | |
81 | + </if> | |
82 | + <if test="highRiskCause != null"> | |
83 | + high_risk_cause = #{highRiskCause}, | |
84 | + </if> | |
85 | + <if test="status != null"> | |
86 | + status = #{status} | |
87 | + </if> | |
88 | + </set> | |
89 | + </sql> | |
90 | + | |
91 | + <select id="getById" resultMap="babyPatientExtendEarMap"> | |
92 | + select id,<include refid="columnList" /> from baby_patient_extend_ear where id = #{id} | |
93 | + </select> | |
94 | + | |
95 | + <select id="getListByCondition" parameterType="map" resultType="map"> | |
96 | + select id,<include refid="columnList" /> from baby_patient_extend_ear | |
97 | + <include refid="columnWhere" /> | |
98 | + <if test="sort != null and sort == true"> | |
99 | + order by id desc | |
100 | + </if> | |
101 | + <if test="currentPage != null and pageSize != null"> | |
102 | + limit #{currentPage},#{pageSize} | |
103 | + </if> | |
104 | + </select> | |
105 | + | |
106 | + <select id="getModelByCondition" parameterType="map" resultMap="babyPatientExtendEarMap"> | |
107 | + select id,<include refid="columnList" /> from baby_patient_extend_ear | |
108 | + <include refid="columnWhere" /> | |
109 | + <if test="sort != null and sort == true"> | |
110 | + order by id desc | |
111 | + </if> | |
112 | + <if test="currentPage != null and pageSize != null"> | |
113 | + limit #{currentPage},#{pageSize} | |
114 | + </if> | |
115 | + </select> | |
116 | + | |
117 | + <select id="getCount" parameterType="map" resultType="integer"> | |
118 | + select count(1) from baby_patient_extend_ear | |
119 | + <include refid="columnWhere" /> | |
120 | + </select> | |
121 | + | |
122 | + <insert id="save" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEar" useGeneratedKeys="true" keyProperty="id"> | |
123 | + insert into baby_patient_extend_ear(<include refid="columnList" />) values(#{personId},#{createDate},#{createUserId},#{createHospitalId},#{lastUpdateDate},#{lastUpdateUserId},#{lastUpdateHospitalId},#{highRiskCause},#{status}) | |
124 | + </insert> | |
125 | + | |
126 | + <delete id="deleteById" parameterType="integer"> | |
127 | + delete from baby_patient_extend_ear where id = #{id} | |
128 | + </delete> | |
129 | + | |
130 | + <delete id="deleteByIds" parameterType="list"> | |
131 | + delete from baby_patient_extend_ear where id in | |
132 | + <foreach collection="list" open="(" close=")" separator="," item="id"> | |
133 | + #{id} | |
134 | + </foreach> | |
135 | + </delete> | |
136 | + | |
137 | + <update id="update" parameterType="com.lyms.platform.permission.model.BabyPatientExtendEar"> | |
138 | + update baby_patient_extend_ear | |
139 | + <include refid="columnUpdate" /> | |
140 | + where id = #{id} | |
141 | + </update> | |
142 | +</mapper> |
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
View file @
0469326
... | ... | @@ -19,7 +19,7 @@ |
19 | 19 | |
20 | 20 | |
21 | 21 | <sql id="columnList"> |
22 | - sequence_id,create_date,use_date,user_id,create_user_id,coupon_template_id,create_hospital_id,used_hospital_id,status | |
22 | + sequence_id,create_date,use_date, operator_use_id, user_id,create_user_id,coupon_template_id,create_hospital_id,used_hospital_id,status | |
23 | 23 | </sql> |
24 | 24 | |
25 | 25 | <select id="findList" parameterType="map" resultMap="couponInfoMap"> |
... | ... | @@ -38,7 +38,7 @@ |
38 | 38 | </select> |
39 | 39 | |
40 | 40 | <insert id="save" parameterType="com.lyms.platform.permission.model.CouponInfo"> |
41 | - insert into coupon_info(id, <include refid="columnList" />) values(#{id},#{sequenceId},#{createDate},#{useDate},#{userId},#{createUserId},#{couponTemplateId},#{createHospitalId},#{usedHospitalId},#{status}) | |
41 | + insert into coupon_info(id, <include refid="columnList" />) values(#{id},#{sequenceId},#{createDate},#{useDate},#{operatorUseId},#{userId},#{createUserId},#{couponTemplateId},#{createHospitalId},#{usedHospitalId},#{status}) | |
42 | 42 | </insert> |
43 | 43 | |
44 | 44 | <select id="findTemp" parameterType="map" resultType="map"> |
... | ... | @@ -60,8 +60,9 @@ |
60 | 60 | |
61 | 61 | <select id="findInfo" parameterType="map" resultType="map"> |
62 | 62 | select b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status |
63 | - from coupon_info a, coupon_template b | |
64 | - where a.user_id = #{userId} and a.create_hospital_id = #{hospitalId} and a.coupon_template_id = b.id | |
63 | + from coupon_info a, coupon_template b, coupon_type c | |
64 | + where a.user_id = #{userId} and a.create_hospital_id = #{hospitalId} and a.coupon_template_id = b.id and b.type_id=c.id | |
65 | + order by c.type, b.coupon_order | |
65 | 66 | </select> |
66 | 67 | |
67 | 68 | <select id="findValidateParam" parameterType="map" resultType="map"> |
... | ... | @@ -75,6 +76,12 @@ |
75 | 76 | update coupon_info |
76 | 77 | set use_date = #{useDate}, operator_use_id = #{operatorUseId}, used_hospital_id = #{hospitalId}, status = #{status} |
77 | 78 | where sequence_id = #{code} |
79 | + </update> | |
80 | + | |
81 | + <update id="update" parameterType="map"> | |
82 | + update coupon_info | |
83 | + set use_date = #{useDate}, operator_use_id = #{operatorUseId}, used_hospital_id = #{hospitalId}, status = #{status} | |
84 | + where user_id = #{userId} | |
78 | 85 | </update> |
79 | 86 | |
80 | 87 | <select id="findTypes" parameterType="map" resultType="integer"> |
platform-common/src/main/java/com/lyms/platform/common/result/BaseResponse.java
View file @
0469326
... | ... | @@ -4,50 +4,58 @@ |
4 | 4 | import com.lyms.platform.common.utils.DateUtil; |
5 | 5 | |
6 | 6 | /** |
7 | - * 基础的返回模型 | |
7 | + * 基础的返回模型 | |
8 | 8 | * |
9 | 9 | * @author Administrator |
10 | + * | |
10 | 11 | */ |
11 | 12 | public class BaseResponse extends BaseModel { |
12 | 13 | |
13 | - /** | |
14 | - * | |
15 | - */ | |
16 | - private static final long serialVersionUID = 1L; | |
14 | + /** | |
15 | + * | |
16 | + */ | |
17 | + private static final long serialVersionUID = 1L; | |
17 | 18 | |
18 | - protected String errormsg; | |
19 | - protected int errorcode; | |
19 | + protected String errormsg; | |
20 | + protected int errorcode; | |
21 | + private Object object; | |
20 | 22 | |
21 | - public String getNow() { | |
22 | - return DateUtil.getymd(); | |
23 | - } | |
23 | + public String getNow() { | |
24 | + return DateUtil.getymd(); | |
25 | + } | |
24 | 26 | |
25 | - public BaseResponse() { | |
26 | - super(); | |
27 | - } | |
27 | + public BaseResponse() { | |
28 | + super(); | |
29 | + } | |
28 | 30 | |
29 | - public BaseResponse(String errormsg, int errorcode) { | |
30 | - super(); | |
31 | - this.errormsg = errormsg; | |
32 | - this.errorcode = errorcode; | |
33 | - } | |
31 | + public BaseResponse(String errormsg, int errorcode) { | |
32 | + super(); | |
33 | + this.errormsg = errormsg; | |
34 | + this.errorcode = errorcode; | |
35 | + } | |
34 | 36 | |
35 | - public String getErrormsg() { | |
36 | - return errormsg; | |
37 | - } | |
37 | + public String getErrormsg() { | |
38 | + return errormsg; | |
39 | + } | |
38 | 40 | |
39 | - public BaseResponse setErrormsg(String errormsg) { | |
40 | - this.errormsg = errormsg; | |
41 | - return this; | |
42 | - } | |
41 | + public BaseResponse setErrormsg(String errormsg) { | |
42 | + this.errormsg = errormsg; | |
43 | + return this; | |
44 | + } | |
45 | + public BaseResponse setErrorcode(int errorcode) { | |
46 | + this.errorcode = errorcode; | |
47 | + return this; | |
48 | + } | |
49 | + public int getErrorcode() { | |
50 | + return errorcode; | |
51 | + } | |
43 | 52 | |
44 | - public BaseResponse setErrorcode(int errorcode) { | |
45 | - this.errorcode = errorcode; | |
46 | - return this; | |
47 | - } | |
53 | + public Object getObject() { | |
54 | + return object; | |
55 | + } | |
48 | 56 | |
49 | - public int getErrorcode() { | |
50 | - return errorcode; | |
51 | - } | |
57 | + public void setObject(Object object) { | |
58 | + this.object = object; | |
59 | + } | |
52 | 60 | } |
platform-common/src/main/java/com/lyms/platform/common/result/PageResult.java
View file @
0469326
platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java
View file @
0469326
... | ... | @@ -14,8 +14,8 @@ |
14 | 14 | |
15 | 15 | |
16 | 16 | COUPON_TEMP_NOT_FOUND(1006, "医院未绑定模板或无可生成的优惠券类型"), |
17 | - COUPON_IS_CREATED(1007, "该用户已生成产检券"), | |
18 | - COUPON_NOT_AVAILABLE(1008, "使用的产检券类型不正确"), | |
17 | + COUPON_IS_CREATED(1007, "该用户已生成优惠券"), | |
18 | + COUPON_NOT_AVAILABLE(1008, "使用的优惠券类型不正确"), | |
19 | 19 | COUPON_AREA_NO_USE(1009, "该区域不能使用"), |
20 | 20 | |
21 | 21 | COUPON_NOT_FOUND(1001, "优惠券不存在"), |
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
0469326
... | ... | @@ -884,10 +884,10 @@ |
884 | 884 | * @return |
885 | 885 | */ |
886 | 886 | public static boolean isBetween(Date date, Date start, Date end) { |
887 | - if(DateUtil.isGtOrEq(date, start) && DateUtil.isLtOrEq(date, end)) { | |
888 | - return true; | |
889 | - } | |
890 | - return false; | |
887 | + long startTime = start.getTime(); | |
888 | + long endTime = end.getTime(); | |
889 | + long time = date.getTime(); | |
890 | + return startTime < time && time < endTime ? true : false; | |
891 | 891 | } |
892 | 892 | |
893 | 893 | public static void main(String[] arg) throws Exception { |
... | ... | @@ -897,6 +897,9 @@ |
897 | 897 | System.out.println(isBetween(now, start, end)); |
898 | 898 | |
899 | 899 | System.out.println(org.apache.commons.lang3.time.DateUtils.addMonths(start ,1).toLocaleString()); |
900 | + long startTime = 1483372800000l; | |
901 | + long endTime = end.getTime(); | |
902 | + System.out.println(); | |
900 | 903 | } |
901 | 904 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
View file @
0469326
... | ... | @@ -16,10 +16,14 @@ |
16 | 16 | import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; |
17 | 17 | import com.lyms.platform.operate.web.facade.AutoMatchFacade; |
18 | 18 | import com.lyms.platform.operate.web.request.*; |
19 | +import com.lyms.platform.permission.service.CouponService; | |
19 | 20 | import org.apache.commons.lang.StringUtils; |
20 | 21 | import org.springframework.beans.factory.annotation.Autowired; |
21 | 22 | import org.springframework.stereotype.Controller; |
22 | -import org.springframework.web.bind.annotation.*; | |
23 | +import org.springframework.web.bind.annotation.RequestBody; | |
24 | +import org.springframework.web.bind.annotation.RequestMapping; | |
25 | +import org.springframework.web.bind.annotation.RequestMethod; | |
26 | +import org.springframework.web.bind.annotation.ResponseBody; | |
23 | 27 | |
24 | 28 | import javax.servlet.http.HttpServletRequest; |
25 | 29 | import javax.servlet.http.HttpServletResponse; |
... | ... | @@ -57,6 +61,8 @@ |
57 | 61 | @Autowired |
58 | 62 | private AutoMatchFacade autoMatchFacade; |
59 | 63 | |
64 | + @Autowired | |
65 | + private CouponService couponService; | |
60 | 66 | /** |
61 | 67 | * |
62 | 68 | * @return |
... | ... | @@ -133,7 +139,19 @@ |
133 | 139 | @TokenRequired |
134 | 140 | public BaseResponse addOneAntenatalExamination(@Valid @RequestBody AntExAddRequest antExAddRequest,HttpServletRequest request) { |
135 | 141 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
136 | - return antenatalExaminationFacade.addOneAntEx(antExAddRequest, loginState.getId()); | |
142 | + /** 验证产检券是否可用 可用就改为已使用状态 */ | |
143 | + if(org.apache.commons.lang3.StringUtils.isNotBlank(antExAddRequest.getCouponCode()) && antExAddRequest.getCouponType() != null) { | |
144 | + BaseObjectResponse resp = couponService.validate(antExAddRequest.getCouponCode(), antExAddRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId())); | |
145 | + if(resp.getErrorcode() != 0) { | |
146 | + return resp; | |
147 | + } else { | |
148 | + couponService.use(autoMatchFacade.getHospitalId(getUserId(request)), antExAddRequest.getCouponCode(), getUserId(request)); | |
149 | + } | |
150 | + } | |
151 | + | |
152 | + BaseResponse baseResponse = antenatalExaminationFacade.addOneAntEx(antExAddRequest, loginState.getId()); | |
153 | + baseResponse.setObject(couponService.getPatientsInfoByCode(antExAddRequest.getCouponCode())); | |
154 | + return baseResponse; | |
137 | 155 | } |
138 | 156 | |
139 | 157 | /** |
... | ... | @@ -147,7 +165,19 @@ |
147 | 165 | @TokenRequired |
148 | 166 | public BaseResponse addOneAntEx(@Valid @RequestBody AntExcAddRequest antExcAddRequest,HttpServletRequest request) { |
149 | 167 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
150 | - return antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest, loginState.getId()); | |
168 | + /** 验证产检券是否可用 可用就改为已使用状态 */ | |
169 | + if(org.apache.commons.lang3.StringUtils.isNotBlank(antExcAddRequest.getCouponCode()) && antExcAddRequest.getCouponType() != null) { | |
170 | + BaseObjectResponse resp = couponService.validate(antExcAddRequest.getCouponCode(), antExcAddRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId())); | |
171 | + if(resp.getErrorcode() != 0) { | |
172 | + return resp; | |
173 | + } else { | |
174 | + couponService.use(autoMatchFacade.getHospitalId(getUserId(request)), antExcAddRequest.getCouponCode(), getUserId(request)); | |
175 | + } | |
176 | + } | |
177 | + | |
178 | + BaseResponse baseResponse = antenatalExaminationFacade.addOneAnetExChu(antExcAddRequest, loginState.getId()); | |
179 | + baseResponse.setObject(couponService.getPatientsInfoByCode(antExcAddRequest.getCouponCode())); | |
180 | + return baseResponse; | |
151 | 181 | } |
152 | 182 | |
153 | 183 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
View file @
0469326
... | ... | @@ -9,6 +9,7 @@ |
9 | 9 | import com.lyms.platform.common.result.BaseObjectResponse; |
10 | 10 | import com.lyms.platform.common.result.BaseResponse; |
11 | 11 | import com.lyms.platform.common.utils.StringUtils; |
12 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
12 | 13 | import com.lyms.platform.operate.web.facade.BabyBookbuildingFacade; |
13 | 14 | import com.lyms.platform.operate.web.request.BabyBookbuildingAddRequest; |
14 | 15 | import com.lyms.platform.operate.web.request.BabyGuideSmsequest; |
15 | 16 | |
... | ... | @@ -16,8 +17,11 @@ |
16 | 17 | import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; |
17 | 18 | import com.lyms.platform.operate.web.result.QueryHospitalListRequest; |
18 | 19 | import com.lyms.platform.operate.web.result.QueryHospitalListResult; |
20 | +import com.lyms.platform.permission.service.CouponService; | |
21 | +import com.lyms.platform.pojo.BabyModel; | |
19 | 22 | import org.apache.log4j.Logger; |
20 | 23 | import org.springframework.beans.factory.annotation.Autowired; |
24 | +import org.springframework.data.mongodb.core.MongoTemplate; | |
21 | 25 | import org.springframework.stereotype.Controller; |
22 | 26 | import org.springframework.web.bind.annotation.*; |
23 | 27 | |
24 | 28 | |
... | ... | @@ -40,7 +44,15 @@ |
40 | 44 | @Autowired |
41 | 45 | private BabyBookbuildingFacade babyBookbuildingFacade; |
42 | 46 | |
47 | + @Autowired | |
48 | + private AutoMatchFacade autoMatchFacade; | |
43 | 49 | |
50 | + @Autowired | |
51 | + private CouponService couponService; | |
52 | + | |
53 | + @Autowired | |
54 | + private MongoTemplate mongoTemplate; | |
55 | + | |
44 | 56 | /** |
45 | 57 | * 添加或者修改儿童建档 |
46 | 58 | * |
47 | 59 | |
48 | 60 | |
... | ... | @@ -66,12 +78,16 @@ |
66 | 78 | * @return |
67 | 79 | */ |
68 | 80 | @RequestMapping(value = "/deleteBabyBuildById/{id}", method = RequestMethod.DELETE) |
81 | + @TokenRequired | |
69 | 82 | @ResponseBody |
70 | - public BaseResponse deleteBabyBuildById(@PathVariable("id") String id) { | |
83 | + public BaseResponse deleteBabyBuildById(@PathVariable("id") String id, HttpServletRequest request) { | |
84 | + BabyModel babyModel = mongoTemplate.findById(id, BabyModel.class); | |
85 | + if(babyModel != null) { | |
86 | + couponService.del(getUserId(request) +"", autoMatchFacade.getHospitalId(getUserId(request)), babyModel.getPid()); | |
87 | + } | |
71 | 88 | return babyBookbuildingFacade.deleteBabyBuildById(id); |
72 | 89 | |
73 | 90 | } |
74 | - | |
75 | 91 | |
76 | 92 | /** |
77 | 93 | * 查询儿童建档信息根据id查询 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
View file @
0469326
1 | 1 | package com.lyms.platform.operate.web.controller; |
2 | 2 | |
3 | 3 | |
4 | -import com.lyms.platform.biz.service.BabyCheckService; | |
5 | 4 | import com.lyms.platform.common.annotation.TokenRequired; |
6 | 5 | import com.lyms.platform.common.base.BaseController; |
7 | 6 | import com.lyms.platform.common.base.LoginContext; |
8 | 7 | |
... | ... | @@ -9,8 +8,10 @@ |
9 | 8 | import com.lyms.platform.common.result.BaseObjectResponse; |
10 | 9 | import com.lyms.platform.common.result.BaseResponse; |
11 | 10 | import com.lyms.platform.common.utils.StringUtils; |
11 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
12 | 12 | import com.lyms.platform.operate.web.facade.BabyCheckFacade; |
13 | 13 | import com.lyms.platform.operate.web.request.BabyCheckRequest; |
14 | +import com.lyms.platform.permission.service.CouponService; | |
14 | 15 | import org.springframework.beans.factory.annotation.Autowired; |
15 | 16 | import org.springframework.stereotype.Controller; |
16 | 17 | import org.springframework.web.bind.annotation.*; |
17 | 18 | |
18 | 19 | |
... | ... | @@ -29,8 +30,13 @@ |
29 | 30 | @Autowired |
30 | 31 | private BabyCheckFacade babyCheckFacade; |
31 | 32 | |
33 | + @Autowired | |
34 | + private AutoMatchFacade autoMatchFacade; | |
32 | 35 | |
36 | + @Autowired | |
37 | + private CouponService couponService; | |
33 | 38 | |
39 | + | |
34 | 40 | /** |
35 | 41 | * 儿保检查添加或者修改 |
36 | 42 | * @param request |
37 | 43 | |
38 | 44 | |
... | ... | @@ -41,11 +47,25 @@ |
41 | 47 | @TokenRequired |
42 | 48 | public BaseResponse addOrUpBabyCheck(@Valid @RequestBody BabyCheckRequest request,HttpServletRequest httpServletRequest) { |
43 | 49 | LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); |
50 | + /** 验证产检券是否可用 可用就改为已使用状态 */ | |
51 | + if(org.apache.commons.lang3.StringUtils.isNotBlank(request.getCouponCode()) && request.getCouponType() != null) { | |
52 | + BaseObjectResponse resp = couponService.validate(request.getCouponCode(), request.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId())); | |
53 | + if(resp.getErrorcode() != 0) { | |
54 | + return resp; | |
55 | + } else { | |
56 | + couponService.use(autoMatchFacade.getHospitalId(getUserId(httpServletRequest)), request.getCouponCode(), getUserId(httpServletRequest)); | |
57 | + } | |
58 | + } | |
59 | + | |
44 | 60 | if (request != null && !StringUtils.isEmpty(request.getId())) |
45 | 61 | { |
46 | - return babyCheckFacade.updateBabyCheck(request,loginState.getId()); | |
62 | + BaseResponse baseResponse = babyCheckFacade.updateBabyCheck(request, loginState.getId()); | |
63 | + baseResponse.setObject(couponService.getPatientsInfoByCode(request.getCouponCode())); | |
64 | + return baseResponse; | |
47 | 65 | } |
48 | - return babyCheckFacade.addBabyCheck(request,loginState.getId()); | |
66 | + BaseResponse baseResponse = babyCheckFacade.addBabyCheck(request, loginState.getId()); | |
67 | + baseResponse.setObject(couponService.getPatientsInfoByCode(request.getCouponCode())); | |
68 | + return baseResponse; | |
49 | 69 | } |
50 | 70 | |
51 | 71 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DischargeAbstractController.java
View file @
0469326
... | ... | @@ -6,11 +6,13 @@ |
6 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
7 | 7 | import com.lyms.platform.common.result.BaseObjectResponse; |
8 | 8 | import com.lyms.platform.common.utils.ExceptionUtils; |
9 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
9 | 10 | import com.lyms.platform.operate.web.facade.DischargeAbstractFacade; |
10 | 11 | import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest; |
11 | 12 | import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest; |
12 | 13 | import com.lyms.platform.operate.web.result.DischargeAbstractQueryResult; |
13 | 14 | import com.lyms.platform.operate.web.result.DischargeAbstractSaveResult; |
15 | +import com.lyms.platform.permission.service.CouponService; | |
14 | 16 | import org.springframework.beans.factory.annotation.Autowired; |
15 | 17 | import org.springframework.stereotype.Controller; |
16 | 18 | import org.springframework.web.bind.annotation.RequestBody; |
... | ... | @@ -32,6 +34,12 @@ |
32 | 34 | @Autowired |
33 | 35 | private DischargeAbstractFacade dischargeAbstractFacade; |
34 | 36 | |
37 | + @Autowired | |
38 | + private CouponService couponService; | |
39 | + | |
40 | + @Autowired | |
41 | + private AutoMatchFacade autoMatchFacade; | |
42 | + | |
35 | 43 | /** |
36 | 44 | * @auther HuJiaqi |
37 | 45 | * @createTime 2016年12月05日 14时37分 |
38 | 46 | |
39 | 47 | |
40 | 48 | |
41 | 49 | |
... | ... | @@ -42,18 +50,35 @@ |
42 | 50 | @RequestMapping(value = "save", method = RequestMethod.POST, consumes = "application/json") |
43 | 51 | public BaseObjectResponse save(HttpServletRequest httpServletRequest, @RequestBody DischargeAbstractSaveRequest dischargeAbstractSaveRequest) { |
44 | 52 | BaseObjectResponse baseObjectResponse; |
53 | + LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); | |
54 | + | |
55 | + /** 验证产检券是否可用 可用就改为已使用状态 */ | |
56 | + if(org.apache.commons.lang3.StringUtils.isNotBlank(dischargeAbstractSaveRequest.getCouponCode()) && dischargeAbstractSaveRequest.getCouponType() != null) { | |
57 | + BaseObjectResponse resp = couponService.validate(dischargeAbstractSaveRequest.getCouponCode(), dischargeAbstractSaveRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId())); | |
58 | + if(resp.getErrorcode() != 0) { | |
59 | + return resp; | |
60 | + } else { | |
61 | + couponService.use(autoMatchFacade.getHospitalId(getUserId(httpServletRequest)), dischargeAbstractSaveRequest.getCouponCode(), getUserId(httpServletRequest)); | |
62 | + } | |
63 | + } | |
64 | + | |
45 | 65 | try { |
46 | 66 | dischargeAbstractSaveRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); |
47 | 67 | DischargeAbstractSaveResult dischargeAbstractSaveResult = dischargeAbstractFacade.save(dischargeAbstractSaveRequest); |
48 | 68 | if (dischargeAbstractSaveResult.getErrorcode() != ErrorCodeConstants.SUCCESS) { |
49 | 69 | baseObjectResponse = new BaseObjectResponse().setErrorcode(dischargeAbstractSaveResult.getErrorcode()).setErrormsg(dischargeAbstractSaveResult.getErrormsg()); |
70 | + baseObjectResponse.setObject(couponService.getPatientsInfoByCode(dischargeAbstractSaveRequest.getCouponCode())); | |
50 | 71 | return baseObjectResponse; |
51 | 72 | } |
52 | 73 | baseObjectResponse = new BaseObjectResponse().setErrorcode(dischargeAbstractSaveResult.getErrorcode()).setErrormsg(dischargeAbstractSaveResult.getErrormsg()).setData(dischargeAbstractSaveResult); |
74 | + baseObjectResponse.setObject(couponService.getPatientsInfoByCode(dischargeAbstractSaveRequest.getCouponCode())); | |
53 | 75 | } catch (Exception e) { |
54 | 76 | baseObjectResponse = new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SYSTEM_ERROR).setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION); |
77 | + baseObjectResponse.setObject(couponService.getPatientsInfoByCode(dischargeAbstractSaveRequest.getCouponCode())); | |
55 | 78 | ExceptionUtils.catchException(e, "dischargeAbstract/save异常"); |
56 | 79 | } |
80 | + | |
81 | + baseObjectResponse.setObject(couponService.getPatientsInfoByCode(dischargeAbstractSaveRequest.getCouponCode())); | |
57 | 82 | return baseObjectResponse; |
58 | 83 | } |
59 | 84 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
View file @
0469326
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.permission.model.BabyPatientExtendEar; | |
7 | +import com.lyms.platform.permission.model.BabyPatientExtendEarBirth; | |
8 | +import com.lyms.platform.permission.model.BabyPatientExtendEarFamily; | |
9 | +import com.lyms.platform.permission.model.BabyPatientExtendEarMother; | |
10 | +import com.lyms.platform.permission.service.BabyPatientExtendEarService; | |
11 | +import org.springframework.beans.factory.annotation.Autowired; | |
12 | +import org.springframework.stereotype.Controller; | |
13 | +import org.springframework.web.bind.annotation.RequestMapping; | |
14 | +import org.springframework.web.bind.annotation.RequestMethod; | |
15 | +import org.springframework.web.bind.annotation.ResponseBody; | |
16 | + | |
17 | +import javax.servlet.http.HttpServletRequest; | |
18 | + | |
19 | +/** | |
20 | + * 儿童建档相关逻辑 | |
21 | + * @Author: litao | |
22 | + * @Date: 2017/5/10 0010 18:25 | |
23 | + * @Version: V1.0 | |
24 | + */ | |
25 | +@RequestMapping("/ear") | |
26 | +@Controller | |
27 | +public class EarController extends BaseController { | |
28 | + | |
29 | + @Autowired | |
30 | + private BabyPatientExtendEarService babyPatientExtendEarService; | |
31 | + | |
32 | + /** | |
33 | + * 添加儿童建档 | |
34 | + * @return | |
35 | + */ | |
36 | + @RequestMapping(method = RequestMethod.POST) | |
37 | + @ResponseBody | |
38 | + @TokenRequired | |
39 | + public BaseObjectResponse add(BabyPatientExtendEar ear, BabyPatientExtendEarBirth earBirth, | |
40 | + BabyPatientExtendEarMother earMother, BabyPatientExtendEarFamily earFamily, HttpServletRequest request) { | |
41 | + return babyPatientExtendEarService.insert(ear, earBirth, earMother, earFamily, getUserId(request)); | |
42 | + } | |
43 | + | |
44 | + /** | |
45 | + * 获取 添加儿童建档界面的 下拉列表数据 | |
46 | + * @return | |
47 | + */ | |
48 | + @RequestMapping(method = RequestMethod.GET) | |
49 | + @ResponseBody | |
50 | + public BaseObjectResponse config() { | |
51 | + return babyPatientExtendEarService.getConfigs(); | |
52 | + } | |
53 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
0469326
... | ... | @@ -5,7 +5,6 @@ |
5 | 5 | import com.lyms.platform.common.base.LoginContext; |
6 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
7 | 7 | import com.lyms.platform.common.result.BaseListResponse; |
8 | -import com.lyms.platform.common.result.BaseObjectResponse; | |
9 | 8 | import com.lyms.platform.common.result.BaseResponse; |
10 | 9 | import com.lyms.platform.common.utils.BeanUtils; |
11 | 10 | import com.lyms.platform.common.utils.ExcelUtil; |
... | ... | @@ -19,6 +18,7 @@ |
19 | 18 | import com.lyms.platform.operate.web.result.ChildbirthManagerResult; |
20 | 19 | import com.lyms.platform.operate.web.result.NewBabyManagerQueryModel; |
21 | 20 | import com.lyms.platform.operate.web.result.NewBabyManagerResult; |
21 | +import com.lyms.platform.permission.service.CouponService; | |
22 | 22 | import org.apache.commons.lang.StringUtils; |
23 | 23 | import org.springframework.beans.factory.annotation.Autowired; |
24 | 24 | import org.springframework.stereotype.Controller; |
... | ... | @@ -40,6 +40,9 @@ |
40 | 40 | @Autowired |
41 | 41 | private MatDeliverFacade matDeliverFacade; |
42 | 42 | |
43 | + @Autowired | |
44 | + private CouponService couponService; | |
45 | + | |
43 | 46 | /** |
44 | 47 | * 查询分娩记录 |
45 | 48 | * |
... | ... | @@ -68,7 +71,9 @@ |
68 | 71 | @TokenRequired |
69 | 72 | public BaseResponse addOneMatDeliver(@Valid @RequestBody MatDeliverAddRequest deliverAddRequest,HttpServletRequest request){ |
70 | 73 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
71 | - return matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest,loginState.getId()); | |
74 | + BaseResponse baseResponse = matDeliverFacade.addOrUpdateMatDeliver(deliverAddRequest, loginState.getId()); | |
75 | + baseResponse.setObject(couponService.getPatientsInfoByCode(deliverAddRequest.getCouponCode())); | |
76 | + return baseResponse; | |
72 | 77 | } |
73 | 78 | /** |
74 | 79 | * 删除一条删除记录 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java
View file @
0469326
... | ... | @@ -4,10 +4,13 @@ |
4 | 4 | import com.lyms.platform.common.base.BaseController; |
5 | 5 | import com.lyms.platform.common.base.LoginContext; |
6 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
7 | +import com.lyms.platform.common.result.BaseObjectResponse; | |
7 | 8 | import com.lyms.platform.common.result.BaseResponse; |
9 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
8 | 10 | import com.lyms.platform.operate.web.facade.PostReviewFacade; |
9 | 11 | import com.lyms.platform.operate.web.request.PostReviewQueryRequest; |
10 | 12 | import com.lyms.platform.operate.web.request.PostReviewRequest; |
13 | +import com.lyms.platform.permission.service.CouponService; | |
11 | 14 | import org.apache.commons.lang.StringUtils; |
12 | 15 | import org.springframework.beans.factory.annotation.Autowired; |
13 | 16 | import org.springframework.stereotype.Controller; |
... | ... | @@ -28,6 +31,12 @@ |
28 | 31 | @Autowired |
29 | 32 | private PostReviewFacade postReviewFacade; |
30 | 33 | |
34 | + @Autowired | |
35 | + private CouponService couponService; | |
36 | + | |
37 | + @Autowired | |
38 | + private AutoMatchFacade autoMatchFacade; | |
39 | + | |
31 | 40 | @RequestMapping(method = RequestMethod.GET,value = "/cTime") |
32 | 41 | @ResponseBody |
33 | 42 | public long getCurrentTime(){ |
... | ... | @@ -44,7 +53,19 @@ |
44 | 53 | @TokenRequired |
45 | 54 | public BaseResponse addPostReview(@Valid @RequestBody PostReviewRequest postReviewRequest,HttpServletRequest request){ |
46 | 55 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
47 | - return postReviewFacade.addPostReview(postReviewRequest,loginState.getId()); | |
56 | + | |
57 | + /** 验证产检券是否可用 可用就改为已使用状态 */ | |
58 | + if(org.apache.commons.lang3.StringUtils.isNotBlank(postReviewRequest.getCouponCode()) && postReviewRequest.getCouponType() != null) { | |
59 | + BaseObjectResponse resp = couponService.validate(postReviewRequest.getCouponCode(), postReviewRequest.getCouponType(), autoMatchFacade.getHospitalId(loginState.getId())); | |
60 | + if(resp.getErrorcode() != 0) { | |
61 | + return resp; | |
62 | + } else { | |
63 | + couponService.use(autoMatchFacade.getHospitalId(getUserId(request)), postReviewRequest.getCouponCode(), getUserId(request)); | |
64 | + } | |
65 | + } | |
66 | + BaseResponse baseResponse = postReviewFacade.addPostReview(postReviewRequest, loginState.getId()); | |
67 | + baseResponse.setObject(couponService.getPatientsInfoByCode(postReviewRequest.getCouponCode())); | |
68 | + return baseResponse; | |
48 | 69 | } |
49 | 70 | |
50 | 71 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PregnantBuildController.java
View file @
0469326
... | ... | @@ -12,13 +12,16 @@ |
12 | 12 | import com.lyms.platform.common.utils.PropertiesUtils; |
13 | 13 | import com.lyms.platform.common.utils.StringUtils; |
14 | 14 | import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; |
15 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
15 | 16 | import com.lyms.platform.operate.web.facade.BookbuildingFacade; |
16 | 17 | import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; |
17 | 18 | import com.lyms.platform.operate.web.request.BookbuildingQueryRequest; |
18 | 19 | import com.lyms.platform.operate.web.request.YunBookbuildingAddRequest; |
19 | 20 | import com.lyms.platform.permission.service.CouponService; |
21 | +import com.lyms.platform.pojo.Patients; | |
20 | 22 | import org.apache.commons.httpclient.HttpClient; |
21 | 23 | import org.springframework.beans.factory.annotation.Autowired; |
24 | +import org.springframework.data.mongodb.core.MongoTemplate; | |
22 | 25 | import org.springframework.stereotype.Controller; |
23 | 26 | import org.springframework.web.bind.annotation.*; |
24 | 27 | |
25 | 28 | |
... | ... | @@ -49,7 +52,13 @@ |
49 | 52 | @Autowired |
50 | 53 | private CouponService couponService; |
51 | 54 | |
55 | + @Autowired | |
56 | + private MongoTemplate mongoTemplate; | |
52 | 57 | |
58 | + @Autowired | |
59 | + private AutoMatchFacade autoMatchFacade; | |
60 | + | |
61 | + | |
53 | 62 | /** |
54 | 63 | * 查询孕妇建档记录 |
55 | 64 | * @return |
56 | 65 | |
... | ... | @@ -69,11 +78,9 @@ |
69 | 78 | @RequestMapping(method = RequestMethod.POST, value = "/addOrUpdateYunBuild") |
70 | 79 | @ResponseBody |
71 | 80 | @TokenRequired |
72 | - public BaseResponse addOrUpdateYunBuild(@RequestBody YunBookbuildingAddRequest yunBookbuildingAddRequest, String code, HttpServletRequest request) { | |
81 | + public BaseResponse addOrUpdateYunBuild(@RequestBody YunBookbuildingAddRequest yunBookbuildingAddRequest, HttpServletRequest request) { | |
73 | 82 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
74 | 83 | |
75 | - /** 验证产检券是否可用 可用就改为已使用状态 */ | |
76 | -// couponService.validate(loginState.getId(), ) | |
77 | 84 | if (yunBookbuildingAddRequest != null && !StringUtils.isEmpty(yunBookbuildingAddRequest.getId()) ) |
78 | 85 | { |
79 | 86 | return bookbuildingFacade.updatePregnantById(yunBookbuildingAddRequest.getId(), yunBookbuildingAddRequest,loginState.getId()); |
... | ... | @@ -114,6 +121,10 @@ |
114 | 121 | @TokenRequired |
115 | 122 | public BaseResponse deletePregnantById(@PathVariable("id")String id,HttpServletRequest httpServletRequest){ |
116 | 123 | LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext"); |
124 | + Patients patients = mongoTemplate.findById(id, Patients.class); | |
125 | + if(patients != null) { | |
126 | + couponService.del(getUserId(httpServletRequest) +"", autoMatchFacade.getHospitalId(getUserId(httpServletRequest)), patients.getPid()); | |
127 | + } | |
117 | 128 | return bookbuildingFacade.deletePregnantById(id,loginState.getId()); |
118 | 129 | } |
119 | 130 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java
View file @
0469326
... | ... | @@ -5,7 +5,6 @@ |
5 | 5 | import com.lyms.platform.common.utils.DateUtil; |
6 | 6 | import com.lyms.platform.common.utils.JsonUtil; |
7 | 7 | import com.lyms.platform.pojo.AntenatalExaminationModel; |
8 | -import org.codehaus.jackson.annotate.JsonIgnore; | |
9 | 8 | import org.hibernate.validator.constraints.NotEmpty; |
10 | 9 | |
11 | 10 | import java.util.List; |
... | ... | @@ -86,6 +85,26 @@ |
86 | 85 | //下次产检日期 |
87 | 86 | private String nextCheckTime; |
88 | 87 | private String cDueWeek; |
88 | + | |
89 | + private String couponCode; | |
90 | + | |
91 | + private Integer couponType; | |
92 | + | |
93 | + public String getCouponCode() { | |
94 | + return couponCode; | |
95 | + } | |
96 | + | |
97 | + public void setCouponCode(String couponCode) { | |
98 | + this.couponCode = couponCode; | |
99 | + } | |
100 | + | |
101 | + public Integer getCouponType() { | |
102 | + return couponType; | |
103 | + } | |
104 | + | |
105 | + public void setCouponType(Integer couponType) { | |
106 | + this.couponType = couponType; | |
107 | + } | |
89 | 108 | |
90 | 109 | public String getPid() { |
91 | 110 | return pid; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java
View file @
0469326
1 | 1 | package com.lyms.platform.operate.web.request; |
2 | 2 | |
3 | 3 | import com.lyms.platform.common.base.IBasicRequestConvert; |
4 | -import com.lyms.platform.common.core.annotation.form.FormParam; | |
5 | 4 | import com.lyms.platform.common.core.annotation.form.Form; |
5 | +import com.lyms.platform.common.core.annotation.form.FormParam; | |
6 | 6 | import com.lyms.platform.common.utils.DateUtil; |
7 | 7 | import com.lyms.platform.common.utils.JsonUtil; |
8 | 8 | import com.lyms.platform.pojo.AntExChuModel; |
9 | 9 | import org.apache.commons.lang.StringUtils; |
10 | 10 | import org.hibernate.validator.constraints.NotEmpty; |
11 | 11 | |
12 | -import java.util.Date; | |
13 | 12 | import java.util.List; |
14 | 13 | import java.util.Map; |
15 | 14 | |
... | ... | @@ -203,6 +202,26 @@ |
203 | 202 | private Integer abortionZR; |
204 | 203 | //人工流产 |
205 | 204 | private Integer abortionRG; |
205 | + | |
206 | + private String couponCode; | |
207 | + | |
208 | + private Integer couponType; | |
209 | + | |
210 | + public String getCouponCode() { | |
211 | + return couponCode; | |
212 | + } | |
213 | + | |
214 | + public void setCouponCode(String couponCode) { | |
215 | + this.couponCode = couponCode; | |
216 | + } | |
217 | + | |
218 | + public Integer getCouponType() { | |
219 | + return couponType; | |
220 | + } | |
221 | + | |
222 | + public void setCouponType(Integer couponType) { | |
223 | + this.couponType = couponType; | |
224 | + } | |
206 | 225 | |
207 | 226 | public String getBarCode() { |
208 | 227 | return barCode; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
View file @
0469326
... | ... | @@ -239,6 +239,26 @@ |
239 | 239 | |
240 | 240 | private String monthAge; |
241 | 241 | |
242 | + private String couponCode; | |
243 | + | |
244 | + private Integer couponType; | |
245 | + | |
246 | + public String getCouponCode() { | |
247 | + return couponCode; | |
248 | + } | |
249 | + | |
250 | + public void setCouponCode(String couponCode) { | |
251 | + this.couponCode = couponCode; | |
252 | + } | |
253 | + | |
254 | + public Integer getCouponType() { | |
255 | + return couponType; | |
256 | + } | |
257 | + | |
258 | + public void setCouponType(Integer couponType) { | |
259 | + this.couponType = couponType; | |
260 | + } | |
261 | + | |
242 | 262 | public String getWeightEvaluate() { |
243 | 263 | return weightEvaluate; |
244 | 264 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractQueryRequest.java
View file @
0469326
... | ... | @@ -23,6 +23,8 @@ |
23 | 23 | |
24 | 24 | private Integer operatorId; |
25 | 25 | |
26 | + private String coupon; | |
27 | + | |
26 | 28 | public Integer getOperatorId() { |
27 | 29 | return operatorId; |
28 | 30 | } |
... | ... | @@ -45,6 +47,14 @@ |
45 | 47 | |
46 | 48 | public void setVcCardNo(String vcCardNo) { |
47 | 49 | this.vcCardNo = vcCardNo; |
50 | + } | |
51 | + | |
52 | + public String getCoupon() { | |
53 | + return coupon; | |
54 | + } | |
55 | + | |
56 | + public void setCoupon(String coupon) { | |
57 | + this.coupon = coupon; | |
48 | 58 | } |
49 | 59 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java
View file @
0469326
... | ... | @@ -57,6 +57,26 @@ |
57 | 57 | |
58 | 58 | private String pId; |
59 | 59 | |
60 | + private String couponCode; | |
61 | + | |
62 | + private Integer couponType; | |
63 | + | |
64 | + public String getCouponCode() { | |
65 | + return couponCode; | |
66 | + } | |
67 | + | |
68 | + public void setCouponCode(String couponCode) { | |
69 | + this.couponCode = couponCode; | |
70 | + } | |
71 | + | |
72 | + public Integer getCouponType() { | |
73 | + return couponType; | |
74 | + } | |
75 | + | |
76 | + public void setCouponType(Integer couponType) { | |
77 | + this.couponType = couponType; | |
78 | + } | |
79 | + | |
60 | 80 | public static class Baby { |
61 | 81 | |
62 | 82 | /** |
... | ... | @@ -179,6 +199,8 @@ |
179 | 199 | * @discription 其他筛查具体信息 |
180 | 200 | */ |
181 | 201 | private String orderScreenDescription; |
202 | + | |
203 | + | |
182 | 204 | |
183 | 205 | public String getpId() { |
184 | 206 | return pId; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
View file @
0469326
... | ... | @@ -3,17 +3,11 @@ |
3 | 3 | import com.lyms.platform.beans.SerialIdEnum; |
4 | 4 | import com.lyms.platform.common.base.IBasicRequestConvert; |
5 | 5 | import com.lyms.platform.common.core.annotation.form.Form; |
6 | -import com.lyms.platform.common.enums.SexTypeEnums; | |
7 | -import com.lyms.platform.common.enums.VisitStatusEnums; | |
8 | -import com.lyms.platform.common.enums.YnEnums; | |
9 | 6 | import com.lyms.platform.common.utils.DateUtil; |
10 | 7 | import com.lyms.platform.common.utils.JsonUtil; |
11 | -import com.lyms.platform.pojo.BabyModel; | |
12 | 8 | import com.lyms.platform.pojo.MaternalDeliverModel; |
13 | 9 | |
14 | 10 | import java.io.Serializable; |
15 | -import java.util.ArrayList; | |
16 | -import java.util.Date; | |
17 | 11 | import java.util.List; |
18 | 12 | import java.util.Map; |
19 | 13 | |
... | ... | @@ -86,6 +80,26 @@ |
86 | 80 | private String fmHospital; |
87 | 81 | //接生医生 |
88 | 82 | private String deliverDoctor; |
83 | + | |
84 | + private String couponCode; | |
85 | + | |
86 | + private Integer couponType; | |
87 | + | |
88 | + public String getCouponCode() { | |
89 | + return couponCode; | |
90 | + } | |
91 | + | |
92 | + public void setCouponCode(String couponCode) { | |
93 | + this.couponCode = couponCode; | |
94 | + } | |
95 | + | |
96 | + public Integer getCouponType() { | |
97 | + return couponType; | |
98 | + } | |
99 | + | |
100 | + public void setCouponType(Integer couponType) { | |
101 | + this.couponType = couponType; | |
102 | + } | |
89 | 103 | |
90 | 104 | public String getPid() { |
91 | 105 | return pid; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
View file @
0469326
... | ... | @@ -97,6 +97,26 @@ |
97 | 97 | private String nextCheckTime; |
98 | 98 | private String yl; |
99 | 99 | |
100 | + private String couponCode; | |
101 | + | |
102 | + private Integer couponType; | |
103 | + | |
104 | + public String getCouponCode() { | |
105 | + return couponCode; | |
106 | + } | |
107 | + | |
108 | + public void setCouponCode(String couponCode) { | |
109 | + this.couponCode = couponCode; | |
110 | + } | |
111 | + | |
112 | + public Integer getCouponType() { | |
113 | + return couponType; | |
114 | + } | |
115 | + | |
116 | + public void setCouponType(Integer couponType) { | |
117 | + this.couponType = couponType; | |
118 | + } | |
119 | + | |
100 | 120 | public String getPid() { |
101 | 121 | return pid; |
102 | 122 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java
View file @
0469326
... | ... | @@ -160,6 +160,26 @@ |
160 | 160 | @FormParam |
161 | 161 | private String pid; |
162 | 162 | |
163 | + private String couponCode; | |
164 | + | |
165 | + private Integer couponType; | |
166 | + | |
167 | + public String getCouponCode() { | |
168 | + return couponCode; | |
169 | + } | |
170 | + | |
171 | + public void setCouponCode(String couponCode) { | |
172 | + this.couponCode = couponCode; | |
173 | + } | |
174 | + | |
175 | + public Integer getCouponType() { | |
176 | + return couponType; | |
177 | + } | |
178 | + | |
179 | + public void setCouponType(Integer couponType) { | |
180 | + this.couponType = couponType; | |
181 | + } | |
182 | + | |
163 | 183 | public String getPid() { |
164 | 184 | return pid; |
165 | 185 | } |
... | ... | @@ -532,5 +552,7 @@ |
532 | 552 | public void setId(String id) { |
533 | 553 | this.id = id; |
534 | 554 | } |
555 | + | |
556 | + | |
535 | 557 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/platform/BaseConfigConstant.java
View file @
0469326
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/platform/BaseConfigUtil.java
View file @
0469326
1 | +package com.lyms.platform.operate.web.utils.platform; | |
2 | + | |
3 | +import com.lyms.platform.pojo.BasicConfig; | |
4 | +import org.apache.struts.config.BaseConfig; | |
5 | +import org.slf4j.Logger; | |
6 | +import org.slf4j.LoggerFactory; | |
7 | +import org.springframework.beans.factory.annotation.Autowired; | |
8 | +import org.springframework.data.mongodb.core.MongoTemplate; | |
9 | +import org.springframework.stereotype.Component; | |
10 | + | |
11 | +import javax.annotation.PostConstruct; | |
12 | +import java.util.ArrayList; | |
13 | +import java.util.List; | |
14 | +import java.util.Map; | |
15 | + | |
16 | +/** | |
17 | + * @Author: litao | |
18 | + * @Date: 2017/5/12 0012 14:55 | |
19 | + * @Version: V1.0 | |
20 | + */ | |
21 | +@Component | |
22 | +public class BaseConfigUtil { | |
23 | + | |
24 | + private Logger logger = LoggerFactory.getLogger(BaseConfigUtil.class); | |
25 | + | |
26 | + @Autowired | |
27 | + private MongoTemplate mongoTemplate; | |
28 | + | |
29 | + /** 用于存储 k-v 的数据*/ | |
30 | + private List<Map<String, BaseConfig>> maps = new ArrayList<>(); | |
31 | + | |
32 | + /** 用于存储 parent key 相同的数据 */ | |
33 | + private List<Map<String, List<BaseConfig>>> parentMaps = new ArrayList<>(); | |
34 | + | |
35 | + | |
36 | + /** | |
37 | + * 初始平台缓存信息 | |
38 | + */ | |
39 | + @PostConstruct | |
40 | + public void initCache() { | |
41 | + List<BasicConfig> configs = mongoTemplate.findAll(BasicConfig.class); | |
42 | + | |
43 | + } | |
44 | + | |
45 | + /** | |
46 | + * 删除平台缓存信息 | |
47 | + */ | |
48 | + public void deleteCache() { | |
49 | + | |
50 | + } | |
51 | + | |
52 | +} |