Commit 13e45e507402467ceb05a1fa3709e48cb6be28b8
Exists in
master
and in
1 other branch
Merge remote-tracking branch 'origin/master'
Showing 6 changed files
- platform-common/src/main/java/com/lyms/platform/common/enums/EyeHighRiskEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsEnums.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java
platform-common/src/main/java/com/lyms/platform/common/enums/EyeHighRiskEnums.java
View file @
13e45e5
| ... | ... | @@ -10,15 +10,12 @@ |
| 10 | 10 | * 眼保健高危因素 |
| 11 | 11 | */ |
| 12 | 12 | public enum EyeHighRiskEnums { |
| 13 | - ONE(1, "新生儿重症监护病房住院超过7议案并有连续吸氧(高浓度)史"), | |
| 14 | -// TWO(2, "临床上存在遗传性眼病家庭史或怀疑有眼病有关的综合征,例如先天性白内障、先天性青光眼、视网膜母细胞瘤、先天性小眼球、眼球震颤等"), | |
| 15 | - TWO(2, "先天性白内障、先天性青光眼、视网膜母细胞瘤、先天性小眼球、眼球震颤等"), | |
| 16 | -// THREE(3, "巨细胞病毒、风疹病毒、疱疹病毒、梅毒或毒浆体原虫(弓形体)等引起的宫内感染"), | |
| 17 | - THREE(3, "宫内感染"), | |
| 18 | - FOUR(4, "颅面形态畸形、大面积颜面部血管瘤,或者哭闹时眼球外凸"), | |
| 19 | - FIVE(5, "出生难产、器械助产"), | |
| 20 | - SIX(6, "眼部持续流泪、有大量分泌物"), | |
| 21 | - SEVEN(7, "出生体重<2000g的早产儿和低出生体重儿,应当在出生后4-6周或矫正胎龄32周,由眼科医师进行首次眼病变筛查"); | |
| 13 | + ONE(1, "先天性白内障"), | |
| 14 | + TWO(2, "先天性青光眼"), | |
| 15 | + THREE(3, "视网膜母细胞瘤"), | |
| 16 | + FOUR(4, "先天性小眼球"), | |
| 17 | + FIVE(5, "眼球震颤"), | |
| 18 | + SIX(6, "其他"); | |
| 22 | 19 | |
| 23 | 20 | private Integer id; |
| 24 | 21 | private String name; |
platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsEnums.java
View file @
13e45e5
| ... | ... | @@ -7,17 +7,17 @@ |
| 7 | 7 | */ |
| 8 | 8 | public enum HandleOpinionsEnums { |
| 9 | 9 | ONE(1, "请于0月龄回院进行下次保健"), |
| 10 | - TWO(2, "请于30-42天月龄回院进行下次保健"), | |
| 11 | - THREE(3, "请于3个月月龄回院进行下次保健"), | |
| 12 | - FOUR(4, "请于6个月月龄回院进行下次保健"), | |
| 13 | - FIVE(5, "请于9个月月龄回院进行下次保健"), | |
| 14 | - SIX(6, "请于1岁月龄回院进行下次保健"), | |
| 15 | - SEVEN(7, "请于1岁半月龄回院进行下次保健"), | |
| 16 | - EIGHT(8, "请于2岁月龄回院进行下次保健"), | |
| 17 | - NIGHT(9, "请于3岁月龄回院进行下次保健"), | |
| 18 | - TEN(10, "请于4岁月龄回院进行下次保健"), | |
| 19 | - ELEVEN(11, "请于5岁月龄回院进行下次保健"), | |
| 20 | - TWELVE(12, "请于6岁月龄回院进行下次保健"); | |
| 10 | + TWO(2, "请于30-42天回院进行下次保健"), | |
| 11 | + THREE(3, "请于3个月回院进行下次保健"), | |
| 12 | + FOUR(4, "请于6个月回院进行下次保健"), | |
| 13 | + FIVE(5, "请于9个月回院进行下次保健"), | |
| 14 | + SIX(6, "请于1岁回院进行下次保健"), | |
| 15 | + SEVEN(7, "请于1岁半回院进行下次保健"), | |
| 16 | + EIGHT(8, "请于2岁回院进行下次保健"), | |
| 17 | + NIGHT(9, "请于3岁回院进行下次保健"), | |
| 18 | + TEN(10, "请于4岁回院进行下次保健"), | |
| 19 | + ELEVEN(11, "请于5岁回院进行下次保健"), | |
| 20 | + TWELVE(12, "请于6岁回院进行下次保健"); | |
| 21 | 21 | |
| 22 | 22 | private Integer id; |
| 23 | 23 | private String name; |
platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
View file @
13e45e5
| ... | ... | @@ -11,6 +11,10 @@ |
| 11 | 11 | @Document(collection="lyms_baby_eye_check") |
| 12 | 12 | public class BabyEyeCheck { |
| 13 | 13 | |
| 14 | + // riskFactorOhter | |
| 15 | + // 异常的备注 | |
| 16 | + private String errorRemark; | |
| 17 | + | |
| 14 | 18 | private String id; |
| 15 | 19 | |
| 16 | 20 | private Date created; |
| ... | ... | @@ -46,6 +50,7 @@ |
| 46 | 50 | * 眼病高危因素 |
| 47 | 51 | */ |
| 48 | 52 | private List<String> riskFactorId; |
| 53 | + private String riskFactorOhter; | |
| 49 | 54 | /** |
| 50 | 55 | * 用于存储mysql 转义 |
| 51 | 56 | */ |
| ... | ... | @@ -219,6 +224,22 @@ |
| 219 | 224 | * 选择性注视卡检查 |
| 220 | 225 | */ |
| 221 | 226 | private String fixationCard; |
| 227 | + | |
| 228 | + public String getErrorRemark() { | |
| 229 | + return errorRemark; | |
| 230 | + } | |
| 231 | + | |
| 232 | + public void setErrorRemark(String errorRemark) { | |
| 233 | + this.errorRemark = errorRemark; | |
| 234 | + } | |
| 235 | + | |
| 236 | + public String getRiskFactorOhter() { | |
| 237 | + return riskFactorOhter; | |
| 238 | + } | |
| 239 | + | |
| 240 | + public void setRiskFactorOhter(String riskFactorOhter) { | |
| 241 | + this.riskFactorOhter = riskFactorOhter; | |
| 242 | + } | |
| 222 | 243 | |
| 223 | 244 | public String getRiskFactor() { |
| 224 | 245 | return riskFactor; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java
View file @
13e45e5
| ... | ... | @@ -280,7 +280,17 @@ |
| 280 | 280 | model.setPostDoc(checkDoctor); |
| 281 | 281 | model.setApplyInfo("产检"); |
| 282 | 282 | model.setApplyTime(DateUtil.getyyyy_MM_dd_hms(new Date())); |
| 283 | - model.setRemark(""); | |
| 283 | + | |
| 284 | + Users users = usersService.getUsers(getUserId(request)); | |
| 285 | + if (users != null) { | |
| 286 | + model.setRemark(users.getAccount()); | |
| 287 | + } | |
| 288 | + else | |
| 289 | + { | |
| 290 | + model.setRemark(""); | |
| 291 | + } | |
| 292 | + | |
| 293 | + | |
| 284 | 294 | |
| 285 | 295 | } |
| 286 | 296 | String result = HospitalCouponPrintUtils.qhdCouponUse(model); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
13e45e5
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java
View file @
13e45e5
| ... | ... | @@ -267,9 +267,9 @@ |
| 267 | 267 | // map.setList(JsonUtil.toList(list, SmsObj.class)); |
| 268 | 268 | // System.out.print(map); |
| 269 | 269 | |
| 270 | - queryMsgList("216", null,null, | |
| 271 | - null,"2017-08-01%2000:00:00", | |
| 272 | - "2017-08-01%2023:59:59",null, | |
| 270 | + queryMsgList("246", null,null, | |
| 271 | + null,null, | |
| 272 | + null,null, | |
| 273 | 273 | null,null , |
| 274 | 274 | 1,10); |
| 275 | 275 |