From 435ff342cb7f80a7f5e0c6e88815a5d116f40c2e Mon Sep 17 00:00:00 2001 From: wtt Date: Sat, 25 Jul 2020 12:02:53 +0800 Subject: [PATCH] update --- .../main/java/com/lyms/platform/common/enums/ChildrenTypeEnums.java | 4 ++-- .../com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/ChildrenTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/ChildrenTypeEnums.java index a45d424..56729da 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/ChildrenTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/ChildrenTypeEnums.java @@ -14,8 +14,8 @@ public enum ChildrenTypeEnums { nlx16s("nlx16s","年龄<16岁"), rh("rh","特殊血型"), /* xd("xd","吸毒史"), - xj("xj","酗酒"),*/ - yys("yys","用药史"), + xj("xj","酗酒"), + yys("yys","用药史"),*/ gxy("gxy","高血压"), tnb("tnb","糖尿病"), szjb("szjb","肾脏疾病"), diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 47afa37..4871067 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -2626,7 +2626,8 @@ public class BabyBookbuildingFacade { buildType.add(2);//产妇分娩建档 babyQuery.setBuildTypeList(buildType); // babyQuery.setDataStatus(true);//排除自动建档数据 - babyQuery.setYn(YnEnums.YES.getId()); +// babyQuery.setYn(YnEnums.YES.getId()); + babyQuery.setPregnancyOut(RenShenJieJuEnums.O.getId()); babyQuery.setMphone(request.getMphone());//母亲联系方式 if (StringUtils.isNotEmpty(request.getBirthStart()) && StringUtils.isNotEmpty(request.getBirthEnd())) {//生日 babyQuery.setBirthStart(DateUtil.parseYMD(request.getBirthStart())); -- 1.8.3.1