Commit e0be0b1441b6f0f914c1639a912900ab99bd446c
1 parent
1e52e7b33b
Exists in
master
and in
1 other branch
滦平出院小结儿保检查
Showing 14 changed files with 314 additions and 5 deletions
- platform-common/src/main/java/com/lyms/platform/common/enums/ZlcpLup3Enums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/ZlcpLupEnums.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
- platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.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/facade/BabyCheckFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.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/request/BabyCheckRequest.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/result/BabyCheckPageResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java
platform-common/src/main/java/com/lyms/platform/common/enums/ZlcpLup3Enums.java
View file @
e0be0b1
| 1 | +package com.lyms.platform.common.enums; | |
| 2 | + | |
| 3 | +import com.lyms.platform.common.utils.StringUtils; | |
| 4 | + | |
| 5 | +/** | |
| 6 | + * 儿保智力测评 | |
| 7 | + * @Author: 武涛涛 | |
| 8 | + * @Date: 2020/12/11 11:36 | |
| 9 | + * ①神经心理发育未见明显异常,建议定期体检 | |
| 10 | + * ②神经心理发育明显落后,建议上级医院进一步检查。 | |
| 11 | + * ③大运动方面发育缓慢根据指导建议多加练习,定期体检 | |
| 12 | + * ④精细方面缓慢根据指导建议多加练习,定期体检 | |
| 13 | + * ⑤语言方面缓慢根据指导建议多加练习,定期体检 | |
| 14 | + * ⑥社交行为方面缓慢根据指导建议多加练习,定期体检 | |
| 15 | + * ⑦适应能力方面缓慢根据指导建议多加练习,定期体检 | |
| 16 | + * ⑧建议多教常识性知识;锻炼社会交往能力;锻炼注意力和观察力;锻炼思维能力;培养是非观念;锻炼自理能力;培养培养交换和分享能力 | |
| 17 | + * ⑨锻炼语言表达能力,练习说句子;颜色和形状加以辨别,注意实物和图片的结合 | |
| 18 | + * ⑩注意握笔姿势 | |
| 19 | + * ⑪不会独坐,建议多锻炼拉坐,靠坐以及独坐姿势不会爬行建议多锻炼 | |
| 20 | + * ⑫不会独走,建议多锻炼 | |
| 21 | + * ⑬不会双脚跳,建议多锻炼 | |
| 22 | + * ⑭不会抓捏,建议多锻炼 | |
| 23 | + * ⑮不会叫爸爸妈妈,建议多锻炼 | |
| 24 | + * ⑯不会说句子,建议多锻炼 | |
| 25 | + */ | |
| 26 | +public enum ZlcpLup3Enums { | |
| 27 | + yl31(1, "神经心理发育未见明显异常,建议定期体检"), | |
| 28 | + yl32(2, "神经心理发育明显落后,建议上级医院进一步检查"), | |
| 29 | + yl33(3, "大运动方面发育缓慢根据指导建议多加练习,定期体检"), | |
| 30 | + yl34(4, "精细方面缓慢根据指导建议多加练习,定期体检"), | |
| 31 | + yl35(5, "语言方面缓慢根据指导建议多加练习,定期体检"), | |
| 32 | + yl36(6, "社交行为方面缓慢根据指导建议多加练习,定期体检"), | |
| 33 | + yl37(7, "适应能力方面缓慢根据指导建议多加练习,定期体检"), | |
| 34 | + yl38(8, "建议多教常识性知识;锻炼社会交往能力;锻炼注意力和观察力;锻炼思维能力;培养是非观念;锻炼自理能力;培养培养交换和分享能力"), | |
| 35 | + yl39(9, "锻炼语言表达能力,练习说句子;颜色和形状加以辨别,注意实物和图片的结合"), | |
| 36 | + yl310(10, "注意握笔姿势"), | |
| 37 | + yl311(11, "不会独坐,建议多锻炼拉坐,靠坐以及独坐姿势不会爬行建议多锻炼"), | |
| 38 | + yl312(12, "不会独走,建议多锻炼"), | |
| 39 | + yl313(13, "不会双脚跳,建议多锻炼"), | |
| 40 | + yl314(14, "不会抓捏,建议多锻炼"), | |
| 41 | + yl315(15, "不会叫爸爸妈妈,建议多锻炼"), | |
| 42 | + yl316(16, "不会说句子,建议多锻炼"), | |
| 43 | + | |
| 44 | + ; | |
| 45 | + | |
| 46 | + private Integer id; | |
| 47 | + private String name; | |
| 48 | + | |
| 49 | + public static ZlcpLup3Enums get(Integer id) { | |
| 50 | + ZlcpLup3Enums[] values = ZlcpLup3Enums.values(); | |
| 51 | + for (ZlcpLup3Enums value : values) { | |
| 52 | + if (value.getId() == id) { | |
| 53 | + return value; | |
| 54 | + } | |
| 55 | + } | |
| 56 | + return null; | |
| 57 | + } | |
| 58 | + | |
| 59 | + ZlcpLup3Enums(Integer id, String name){ | |
| 60 | + this.id = id; | |
| 61 | + this.name = name; | |
| 62 | + } | |
| 63 | + | |
| 64 | + public static String getName(String id) { | |
| 65 | + if(StringUtils.isEmpty(id)) { | |
| 66 | + return null; | |
| 67 | + } | |
| 68 | + int i = Integer.parseInt(id); | |
| 69 | + ZlcpLup3Enums[] values = ZlcpLup3Enums.values(); | |
| 70 | + for (ZlcpLup3Enums value : values) { | |
| 71 | + if (value.getId() == i) { | |
| 72 | + return value.getName(); | |
| 73 | + } | |
| 74 | + } | |
| 75 | + return null; | |
| 76 | + } | |
| 77 | + | |
| 78 | + public Integer getId() { | |
| 79 | + return id; | |
| 80 | + } | |
| 81 | + | |
| 82 | + public void setId(Integer id) { | |
| 83 | + this.id = id; | |
| 84 | + } | |
| 85 | + | |
| 86 | + public String getName() { | |
| 87 | + return name; | |
| 88 | + } | |
| 89 | + | |
| 90 | + public void setName(String name) { | |
| 91 | + this.name = name; | |
| 92 | + } | |
| 93 | + | |
| 94 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/ZlcpLupEnums.java
View file @
e0be0b1
| 1 | +package com.lyms.platform.common.enums; | |
| 2 | + | |
| 3 | +import com.lyms.platform.common.utils.StringUtils; | |
| 4 | + | |
| 5 | +/** | |
| 6 | + * 儿保智力测评 | |
| 7 | + * @Author: 武涛涛 | |
| 8 | + * @Date: 2020/12/11 11:36 | |
| 9 | + */ | |
| 10 | +public enum ZlcpLupEnums { | |
| 11 | + yl1(1, "未见明显异常,建议定期体检。"), | |
| 12 | + yl2(2, "睡觉或哭闹状态,无法测试,指导家长,建议多锻炼追视,找声,抬头方面。"), | |
| 13 | + yl3(3, "红球追视不合格,建议锻炼追视。"), | |
| 14 | + yl4(4, "对格格声反应不合格,建议锻炼找声。"), | |
| 15 | + yl5(5, "抬头角度不够,建议锻炼俯卧抬头。"), | |
| 16 | + | |
| 17 | + | |
| 18 | + ; | |
| 19 | + | |
| 20 | + private Integer id; | |
| 21 | + private String name; | |
| 22 | + | |
| 23 | + public static ZlcpLupEnums get(Integer id) { | |
| 24 | + ZlcpLupEnums[] values = ZlcpLupEnums.values(); | |
| 25 | + for (ZlcpLupEnums value : values) { | |
| 26 | + if (value.getId() == id) { | |
| 27 | + return value; | |
| 28 | + } | |
| 29 | + } | |
| 30 | + return null; | |
| 31 | + } | |
| 32 | + | |
| 33 | + ZlcpLupEnums(Integer id, String name){ | |
| 34 | + this.id = id; | |
| 35 | + this.name = name; | |
| 36 | + } | |
| 37 | + | |
| 38 | + public static String getName(String id) { | |
| 39 | + if(StringUtils.isEmpty(id)) { | |
| 40 | + return null; | |
| 41 | + } | |
| 42 | + int i = Integer.parseInt(id); | |
| 43 | + ZlcpLupEnums[] values = ZlcpLupEnums.values(); | |
| 44 | + for (ZlcpLupEnums value : values) { | |
| 45 | + if (value.getId() == i) { | |
| 46 | + return value.getName(); | |
| 47 | + } | |
| 48 | + } | |
| 49 | + return null; | |
| 50 | + } | |
| 51 | + | |
| 52 | + public Integer getId() { | |
| 53 | + return id; | |
| 54 | + } | |
| 55 | + | |
| 56 | + public void setId(Integer id) { | |
| 57 | + this.id = id; | |
| 58 | + } | |
| 59 | + | |
| 60 | + public String getName() { | |
| 61 | + return name; | |
| 62 | + } | |
| 63 | + | |
| 64 | + public void setName(String name) { | |
| 65 | + this.name = name; | |
| 66 | + } | |
| 67 | + | |
| 68 | +} |
platform-dal/src/main/java/com/lyms/platform/pojo/BabyCheckModel.java
View file @
e0be0b1
| ... | ... | @@ -418,6 +418,9 @@ |
| 418 | 418 | private Map<String, String> yyfyTest; |
| 419 | 419 | //智力测评 |
| 420 | 420 | private String zlcp; |
| 421 | + //智力测评状态(1检查/null是历史数据,2未检查) | |
| 422 | + private String zlcpState; | |
| 423 | + | |
| 421 | 424 | //孤独症筛查 |
| 422 | 425 | private String gdzsc; |
| 423 | 426 | //膳食分析 |
| ... | ... | @@ -1520,6 +1523,14 @@ |
| 1520 | 1523 | |
| 1521 | 1524 | public String getVitaminD() { |
| 1522 | 1525 | return vitaminD; |
| 1526 | + } | |
| 1527 | + | |
| 1528 | + public String getZlcpState() { | |
| 1529 | + return zlcpState; | |
| 1530 | + } | |
| 1531 | + | |
| 1532 | + public void setZlcpState(String zlcpState) { | |
| 1533 | + this.zlcpState = zlcpState; | |
| 1523 | 1534 | } |
| 1524 | 1535 | |
| 1525 | 1536 | public void setVitaminD(String vitaminD) { |
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
View file @
e0be0b1
| ... | ... | @@ -24,11 +24,14 @@ |
| 24 | 24 | private Integer esfs; |
| 25 | 25 | //听性脑干(1通过/2未通过) |
| 26 | 26 | private Integer txng; |
| 27 | + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查) | |
| 28 | + private Map<String,Object> txngNew; | |
| 27 | 29 | //耳聋基因(1通过/2未通过) |
| 28 | 30 | private Integer eljy; |
| 29 | 31 | //口腔(1通过/2未通过) |
| 30 | 32 | private Integer kouq; |
| 31 | - | |
| 33 | + //修改口腔检查:yesOrNo yes○正常 no○异常:下拉项:cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ | |
| 34 | + private Map<String,Object> kouqNew; | |
| 32 | 35 | //是否接种卡介苗 |
| 33 | 36 | private Integer isBCG; |
| 34 | 37 | //卡介苗接种日期 |
| ... | ... | @@ -2316,6 +2319,22 @@ |
| 2316 | 2319 | |
| 2317 | 2320 | public void setYbReflex(String ybReflex) { |
| 2318 | 2321 | this.ybReflex = ybReflex; |
| 2322 | + } | |
| 2323 | + | |
| 2324 | + public Map <String, Object> getTxngNew() { | |
| 2325 | + return txngNew; | |
| 2326 | + } | |
| 2327 | + | |
| 2328 | + public void setTxngNew(Map <String, Object> txngNew) { | |
| 2329 | + this.txngNew = txngNew; | |
| 2330 | + } | |
| 2331 | + | |
| 2332 | + public Map <String, Object> getKouqNew() { | |
| 2333 | + return kouqNew; | |
| 2334 | + } | |
| 2335 | + | |
| 2336 | + public void setKouqNew(Map <String, Object> kouqNew) { | |
| 2337 | + this.kouqNew = kouqNew; | |
| 2319 | 2338 | } |
| 2320 | 2339 | |
| 2321 | 2340 | public String getStReflex() { |
platform-dal/src/main/java/com/lyms/platform/pojo/DischargeAbstractBabyModel.java
View file @
e0be0b1
| ... | ... | @@ -158,12 +158,16 @@ |
| 158 | 158 | private Integer esfs; |
| 159 | 159 | //听性脑干(1通过/2未通过) |
| 160 | 160 | private Integer txng; |
| 161 | + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查) | |
| 162 | + private Map<String,Object> txngNew; | |
| 163 | + | |
| 161 | 164 | //耳聋基因(1通过/2未通过) |
| 162 | 165 | private Integer eljy; |
| 163 | 166 | //口腔(1通过/2未通过) |
| 164 | 167 | private Integer kouq; |
| 168 | + //修改口腔检查:yesOrNo yes○正常 no○异常:下拉项:cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ | |
| 169 | + private Map<String,Object> kouqNew; | |
| 165 | 170 | |
| 166 | - | |
| 167 | 171 | /** |
| 168 | 172 | * @auther HuJiaqi |
| 169 | 173 | * @createTime 2016年12月05日 18时25分 |
| ... | ... | @@ -216,6 +220,22 @@ |
| 216 | 220 | |
| 217 | 221 | public void setHearScrResult(Integer hearScrResult) { |
| 218 | 222 | this.hearScrResult = hearScrResult; |
| 223 | + } | |
| 224 | + | |
| 225 | + public Map <String, Object> getTxngNew() { | |
| 226 | + return txngNew; | |
| 227 | + } | |
| 228 | + | |
| 229 | + public void setTxngNew(Map <String, Object> txngNew) { | |
| 230 | + this.txngNew = txngNew; | |
| 231 | + } | |
| 232 | + | |
| 233 | + public Map <String, Object> getKouqNew() { | |
| 234 | + return kouqNew; | |
| 235 | + } | |
| 236 | + | |
| 237 | + public void setKouqNew(Map <String, Object> kouqNew) { | |
| 238 | + this.kouqNew = kouqNew; | |
| 219 | 239 | } |
| 220 | 240 | |
| 221 | 241 | public Date getbCGVaccinDate() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java
View file @
e0be0b1
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
e0be0b1
| ... | ... | @@ -235,6 +235,11 @@ |
| 235 | 235 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
| 236 | 236 | } |
| 237 | 237 | |
| 238 | + public BaseObjectResponse init() { | |
| 239 | + List<Map<String, Object>> zlcpnr = EnumUtil.toJson(ZlcpLupEnums.class); | |
| 240 | + List<Map<String, Object>> zlcpnr3 = EnumUtil.toJson(ZlcpLup3Enums.class); | |
| 241 | + return RespBuilder.buildSuccess("zlcpnr", zlcpnr,"zlcpnr3",zlcpnr3); | |
| 242 | + } | |
| 238 | 243 | /** |
| 239 | 244 | * 构造保存对象 |
| 240 | 245 | * |
| ... | ... | @@ -362,6 +367,8 @@ |
| 362 | 367 | model.setYyfyTest(request.getYyfyTest()); |
| 363 | 368 | //智力测评 |
| 364 | 369 | model.setZlcp(request.getZlcp()); |
| 370 | + //智力测评状态(1检查/null是历史数据,2未检查) | |
| 371 | + model.setZlcpState(request.getZlcpState()); | |
| 365 | 372 | //孤独症筛查 |
| 366 | 373 | model.setGdzsc(request.getGdzsc()); |
| 367 | 374 | //膳食分析 |
| ... | ... | @@ -1823,7 +1830,8 @@ |
| 1823 | 1830 | //视力筛查项(select 1正常、 2异常:qtText自己填写) |
| 1824 | 1831 | model.setSlscx(checkModel.getSlscx()); |
| 1825 | 1832 | model.sethCheckStatus(checkModel.gethCheckStatus());//血常规检查状态 null | 1是未检查,2是检查 |
| 1826 | - | |
| 1833 | + model.setZlcp(checkModel.getZlcp()); | |
| 1834 | + model.setZlcpState(checkModel.getZlcpState()); | |
| 1827 | 1835 | /*秦皇岛儿保检查使用*/ |
| 1828 | 1836 | model.setBim(checkModel.getBim()); |
| 1829 | 1837 | model.setTestName(checkModel.getTestName()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java
View file @
e0be0b1
| ... | ... | @@ -199,13 +199,20 @@ |
| 199 | 199 | if(babyModel.getTxng() == null && dabm.getTxng()!=null){//听性脑干(1通过/2未通过) |
| 200 | 200 | babyModel.setTxng(dabm.getTxng()); |
| 201 | 201 | } |
| 202 | + | |
| 203 | + if(babyModel.getTxngNew() == null && dabm.getTxngNew()!=null){// 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查) | |
| 204 | + babyModel.setTxngNew(dabm.getTxngNew()); | |
| 205 | + } | |
| 206 | + | |
| 202 | 207 | if(babyModel.getEljy() == null && dabm.getEljy()!=null){//耳聋基因(1通过/2未通过) |
| 203 | 208 | babyModel.setEljy(dabm.getEljy()); |
| 204 | 209 | } |
| 205 | 210 | if(babyModel.getKouq() == null && dabm.getKouq()!=null){ //口腔(1通过/2未通过) |
| 206 | 211 | babyModel.setKouq(dabm.getKouq()); |
| 207 | 212 | } |
| 208 | - | |
| 213 | + if(babyModel.getKouqNew() == null && dabm.getKouqNew()!=null){ //修改口腔检查:yesOrNo yes○正常 no○异常:下拉项:cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ | |
| 214 | + babyModel.setKouqNew(dabm.getKouqNew()); | |
| 215 | + } | |
| 209 | 216 | if(babyModel.getIsBCG() == null && dabm.getIsBCG()!=null){ //是否接种卡介苗 |
| 210 | 217 | babyModel.setIsBCG(dabm.getIsBCG()); |
| 211 | 218 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
e0be0b1
| ... | ... | @@ -5081,8 +5081,10 @@ |
| 5081 | 5081 | /*滦平start 20201103 */ |
| 5082 | 5082 | babyMap.put("esfs", temp.getEsfs()); |
| 5083 | 5083 | babyMap.put("txng", temp.getTxng()); |
| 5084 | + babyMap.put("txngNew", temp.getTxngNew()); | |
| 5084 | 5085 | babyMap.put("eljy", temp.getEljy()); |
| 5085 | 5086 | babyMap.put("kouq", temp.getKouq()); |
| 5087 | + babyMap.put("kouqNew", temp.getKouqNew()); | |
| 5086 | 5088 | /*滦平 end */ |
| 5087 | 5089 | |
| 5088 | 5090 | babyMap.put("isHighRisk", temp.getIsHighRisk()); |
| ... | ... | @@ -5477,6 +5479,8 @@ |
| 5477 | 5479 | //视力筛查项(select 1正常、 2异常:qtText自己填写) |
| 5478 | 5480 | model.setSlscx(checkModel.getSlscx()); |
| 5479 | 5481 | model.sethCheckStatus(checkModel.gethCheckStatus());//血常规检查状态 null | 1是未检查,2是检查 |
| 5482 | + model.setZlcp(checkModel.getZlcp()); | |
| 5483 | + model.setZlcpState(checkModel.getZlcpState()); | |
| 5480 | 5484 | |
| 5481 | 5485 | /*秦皇岛儿保检查使用*/ |
| 5482 | 5486 | model.setBim(checkModel.getBim()); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyCheckRequest.java
View file @
e0be0b1
| ... | ... | @@ -337,6 +337,8 @@ |
| 337 | 337 | private Map yyfyTest; |
| 338 | 338 | //智力测评 |
| 339 | 339 | private String zlcp; |
| 340 | + //智力测评状态(1检查/null是历史数据,2未检查) | |
| 341 | + private String zlcpState; | |
| 340 | 342 | //孤独症筛查 |
| 341 | 343 | private String gdzsc; |
| 342 | 344 | //膳食分析 |
| ... | ... | @@ -2069,6 +2071,14 @@ |
| 2069 | 2071 | |
| 2070 | 2072 | public Map getSlscx() { |
| 2071 | 2073 | return slscx; |
| 2074 | + } | |
| 2075 | + | |
| 2076 | + public String getZlcpState() { | |
| 2077 | + return zlcpState; | |
| 2078 | + } | |
| 2079 | + | |
| 2080 | + public void setZlcpState(String zlcpState) { | |
| 2081 | + this.zlcpState = zlcpState; | |
| 2072 | 2082 | } |
| 2073 | 2083 | |
| 2074 | 2084 | public void setSlscx(Map slscx) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/DischargeAbstractSaveRequest.java
View file @
e0be0b1
| ... | ... | @@ -219,12 +219,15 @@ |
| 219 | 219 | private Integer esfs; |
| 220 | 220 | //听性脑干(1通过/2未通过) |
| 221 | 221 | private Integer txng; |
| 222 | + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查) | |
| 223 | + private Map txngNew; | |
| 222 | 224 | //耳聋基因(1通过/2未通过) |
| 223 | 225 | private Integer eljy; |
| 224 | 226 | //口腔(1通过/2未通过) |
| 225 | 227 | private Integer kouq; |
| 228 | + //修改口腔检查:yesOrNo yes○正常 no○异常:下拉项:cl 唇裂、el腭裂、spz上皮珠、sx舌系带过短、cx唇系带过短、xs新生儿诞生牙、qt其他_____ | |
| 229 | + private Map kouqNew; | |
| 226 | 230 | |
| 227 | - | |
| 228 | 231 | //是否高危儿童 |
| 229 | 232 | private String isHighRisk; |
| 230 | 233 | /** |
| ... | ... | @@ -308,6 +311,22 @@ |
| 308 | 311 | |
| 309 | 312 | public void setbCGVaccinDate(String bCGVaccinDate) { |
| 310 | 313 | this.bCGVaccinDate = bCGVaccinDate; |
| 314 | + } | |
| 315 | + | |
| 316 | + public Map getTxngNew() { | |
| 317 | + return txngNew; | |
| 318 | + } | |
| 319 | + | |
| 320 | + public void setTxngNew(Map txngNew) { | |
| 321 | + this.txngNew = txngNew; | |
| 322 | + } | |
| 323 | + | |
| 324 | + public Map getKouqNew() { | |
| 325 | + return kouqNew; | |
| 326 | + } | |
| 327 | + | |
| 328 | + public void setKouqNew(Map kouqNew) { | |
| 329 | + this.kouqNew = kouqNew; | |
| 311 | 330 | } |
| 312 | 331 | |
| 313 | 332 | public String getHbvVaccinDate() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
View file @
e0be0b1
| ... | ... | @@ -587,6 +587,8 @@ |
| 587 | 587 | private Map yyfyTest; |
| 588 | 588 | //智力测评 |
| 589 | 589 | private String zlcp; |
| 590 | + //智力测评状态(1检查/null是历史数据,2未检查) | |
| 591 | + private String zlcpState; | |
| 590 | 592 | //孤独症筛查 |
| 591 | 593 | private String gdzsc; |
| 592 | 594 | //膳食分析 |
| ... | ... | @@ -1999,6 +2001,14 @@ |
| 1999 | 2001 | |
| 2000 | 2002 | public void setChest(String chest) { |
| 2001 | 2003 | this.chest = chest; |
| 2004 | + } | |
| 2005 | + | |
| 2006 | + public String getZlcpState() { | |
| 2007 | + return zlcpState; | |
| 2008 | + } | |
| 2009 | + | |
| 2010 | + public void setZlcpState(String zlcpState) { | |
| 2011 | + this.zlcpState = zlcpState; | |
| 2002 | 2012 | } |
| 2003 | 2013 | |
| 2004 | 2014 | public String getBelly() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java
View file @
e0be0b1
| ... | ... | @@ -543,6 +543,8 @@ |
| 543 | 543 | private Map yyfyTest; |
| 544 | 544 | //智力测评 |
| 545 | 545 | private String zlcp; |
| 546 | + //智力测评状态(1检查/null是历史数据,2未检查) | |
| 547 | + private String zlcpState; | |
| 546 | 548 | //孤独症筛查 |
| 547 | 549 | private String gdzsc; |
| 548 | 550 | //膳食分析 |
| ... | ... | @@ -606,6 +608,14 @@ |
| 606 | 608 | |
| 607 | 609 | public void setAlotExercise(String alotExercise) { |
| 608 | 610 | this.alotExercise = alotExercise; |
| 611 | + } | |
| 612 | + | |
| 613 | + public String getZlcpState() { | |
| 614 | + return zlcpState; | |
| 615 | + } | |
| 616 | + | |
| 617 | + public void setZlcpState(String zlcpState) { | |
| 618 | + this.zlcpState = zlcpState; | |
| 609 | 619 | } |
| 610 | 620 | |
| 611 | 621 | public String getFineExercise() { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/DischargeAbstractBabyQueryModel.java
View file @
e0be0b1
| ... | ... | @@ -133,10 +133,15 @@ |
| 133 | 133 | private Integer esfs; |
| 134 | 134 | //听性脑干(1通过/2未通过) |
| 135 | 135 | private Integer txng; |
| 136 | + // 听性脑干新的 "tgstate": true(true 通过 false 未通过) "scstate": 1(1 未筛查 2 已筛查) | |
| 137 | + private Map<String,Object> txngNew; | |
| 138 | + | |
| 136 | 139 | //耳聋基因(1通过/2未通过) |
| 137 | 140 | private Integer eljy; |
| 138 | 141 | //口腔(1通过/2未通过) |
| 139 | 142 | private Integer kouq; |
| 143 | + //修改口腔检查:yesOrNo yes○正常 no○异常:下拉项:cl 唇裂、el腭裂、spz 上皮珠、sx 舌系带过短、cx 唇系带过短、xs 新生儿诞生牙、qt 其他_____ | |
| 144 | + private Map<String,Object> kouqNew; | |
| 140 | 145 | /** |
| 141 | 146 | * @auther HuJiaqi |
| 142 | 147 | * @createTime 2016年12月05日 18时25分 |
| ... | ... | @@ -156,6 +161,7 @@ |
| 156 | 161 | */ |
| 157 | 162 | private Map highRiskResult; |
| 158 | 163 | |
| 164 | + | |
| 159 | 165 | /** |
| 160 | 166 | * @auther HuJiaqi |
| 161 | 167 | * @createTime 2016年12月05日 18时25分 |
| ... | ... | @@ -228,6 +234,22 @@ |
| 228 | 234 | |
| 229 | 235 | public String getId() { |
| 230 | 236 | return id; |
| 237 | + } | |
| 238 | + | |
| 239 | + public Map <String, Object> getTxngNew() { | |
| 240 | + return txngNew; | |
| 241 | + } | |
| 242 | + | |
| 243 | + public void setTxngNew(Map <String, Object> txngNew) { | |
| 244 | + this.txngNew = txngNew; | |
| 245 | + } | |
| 246 | + | |
| 247 | + public Map <String, Object> getKouqNew() { | |
| 248 | + return kouqNew; | |
| 249 | + } | |
| 250 | + | |
| 251 | + public void setKouqNew(Map <String, Object> kouqNew) { | |
| 252 | + this.kouqNew = kouqNew; | |
| 231 | 253 | } |
| 232 | 254 | |
| 233 | 255 | public void setId(String id) { |