Commit f1acd7d6dae4816159bf8c4f6cb1a7c4fa20abe3
1 parent
27a0b0cb2f
Exists in
master
and in
6 other branches
update
Showing 4 changed files with 49 additions and 2 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
f1acd7d
... | ... | @@ -1659,6 +1659,8 @@ |
1659 | 1659 | result = getBabyBuildResult(model); |
1660 | 1660 | result.setYlSelect(model.getYlSelect()); |
1661 | 1661 | result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate())); |
1662 | + result.setIsUNHS(model.getIsUNHS()); | |
1663 | + result.setHearScrResult(model.getHearScrResult()); | |
1662 | 1664 | |
1663 | 1665 | result.setZhlbxqState(model.getZhlbxqState()); |
1664 | 1666 | result.setKouqNew(model.getKouqNew()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
f1acd7d
... | ... | @@ -5235,6 +5235,9 @@ |
5235 | 5235 | |
5236 | 5236 | result = result.convertToResult(model); |
5237 | 5237 | result.setYlSelect(model.getYlSelect()); |
5238 | + result.setIsUNHS(model.getIsUNHS()); | |
5239 | + result.setHearScrResult(model.getHearScrResult()); | |
5240 | + | |
5238 | 5241 | result.setNextDate(DateUtil.getyyyy_MM_dd(model.getNextDate())); |
5239 | 5242 | result.setBnationId(model.getBnationId() == null ? "" : getBasicConfig(model.getBnationId()));//民族 |
5240 | 5243 | result.setEncoded(model.getEncoded()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java
View file @
f1acd7d
... | ... | @@ -12,8 +12,13 @@ |
12 | 12 | private String ylSelect; |
13 | 13 | //下次预约 |
14 | 14 | private String nextDate; |
15 | + // 听力是否筛查(20210122 张洁滦平需求,出院小结听力是否筛查 就是 baby耳声发射) | |
16 | + private Integer isUNHS; | |
17 | + /** | |
18 | + * 听筛结果 1-双耳通过,2-右侧未通过,3-左侧为通过,4-双侧未通过 | |
19 | + */ | |
20 | + private Integer hearScrResult; | |
15 | 21 | |
16 | - | |
17 | 22 | // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查) |
18 | 23 | private Map<String,Object> txngNew; |
19 | 24 | //修改口腔检查:yesOrNo yes○正常 no○异常:下拉项:cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ |
... | ... | @@ -1058,6 +1063,22 @@ |
1058 | 1063 | |
1059 | 1064 | public Integer getEljy() { |
1060 | 1065 | return eljy; |
1066 | + } | |
1067 | + | |
1068 | + public Integer getIsUNHS() { | |
1069 | + return isUNHS; | |
1070 | + } | |
1071 | + | |
1072 | + public void setIsUNHS(Integer isUNHS) { | |
1073 | + this.isUNHS = isUNHS; | |
1074 | + } | |
1075 | + | |
1076 | + public Integer getHearScrResult() { | |
1077 | + return hearScrResult; | |
1078 | + } | |
1079 | + | |
1080 | + public void setHearScrResult(Integer hearScrResult) { | |
1081 | + this.hearScrResult = hearScrResult; | |
1061 | 1082 | } |
1062 | 1083 | |
1063 | 1084 | public void setEljy(Integer eljy) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
View file @
f1acd7d
... | ... | @@ -26,8 +26,13 @@ |
26 | 26 | private String ylSelect; |
27 | 27 | //下次预约 |
28 | 28 | private String nextDate; |
29 | + // 听力是否筛查(20210122 张洁滦平需求,出院小结听力是否筛查 就是 baby耳声发射) | |
30 | + private Integer isUNHS; | |
31 | + /** | |
32 | + * 听筛结果 1-双耳通过,2-右侧未通过,3-左侧为通过,4-双侧未通过 | |
33 | + */ | |
34 | + private Integer hearScrResult; | |
29 | 35 | |
30 | - | |
31 | 36 | // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查) |
32 | 37 | private Map<String,Object> txngNew; |
33 | 38 | //修改口腔检查:yesOrNo yes○正常 no○异常:下拉项:cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ |
... | ... | @@ -1277,6 +1282,22 @@ |
1277 | 1282 | |
1278 | 1283 | public Map <String, Object> getKouqNew() { |
1279 | 1284 | return kouqNew; |
1285 | + } | |
1286 | + | |
1287 | + public Integer getIsUNHS() { | |
1288 | + return isUNHS; | |
1289 | + } | |
1290 | + | |
1291 | + public void setIsUNHS(Integer isUNHS) { | |
1292 | + this.isUNHS = isUNHS; | |
1293 | + } | |
1294 | + | |
1295 | + public Integer getHearScrResult() { | |
1296 | + return hearScrResult; | |
1297 | + } | |
1298 | + | |
1299 | + public void setHearScrResult(Integer hearScrResult) { | |
1300 | + this.hearScrResult = hearScrResult; | |
1280 | 1301 | } |
1281 | 1302 | |
1282 | 1303 | public void setKouqNew(Map <String, Object> kouqNew) { |