diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java index 88c84a4..382c286 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java @@ -28,7 +28,11 @@ public class DiagnoseEnums { crbs(15, "传染病史"), ckjc(16, "产科检查"), bc(17, "B超"), - BCRSQK(18, "本次妊娠情况"); + BCRSQK(18, "本次妊娠情况"), + xy(19, "血压"), + xt(20, "血糖"), + bg(21, "丙肝"); + private DiagnoseItemEnums(int id, String title) { this.id = id; @@ -202,6 +206,8 @@ public class DiagnoseEnums { //一般检查 XZ(1, "心脏", 4, TypeEnums.WZ.getId(), 0, ""), FB(2, "肺部", 4, TypeEnums.WZ.getId(), 0, ""), + + //血压 XY(64, "血压", 19, TypeEnums.SZ.getId(), 0, ""), //辅助检查——血常规 @@ -216,6 +222,7 @@ public class DiagnoseEnums { /** * 20190808提出来 */ + //血糖 XT(8, "血糖", 20, TypeEnums.SZ.getId(), 0, "mmol/L"), //辅助检查——肝功能 @@ -229,6 +236,7 @@ public class DiagnoseEnums { /** * 20190808 剔除出来 **/ + //丙肝 GGNBG(14, "丙肝——阳性(+)", 21, TypeEnums.WZJ.getId(), 1, ""), // 辅助检查——乙肝五项 YGBMKY(15, "乙肝表面抗原——阳性(+)", 8, TypeEnums.WZJ.getId(), 1, ""), diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 0df2f09..e746393 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -3919,10 +3919,15 @@ public class AntenatalExaminationFacade { } } } + + } + + + if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.xy.getId())) { //血压 if (!antExcAddRequest.getBp().isEmpty() && antExcAddRequest.getBp().size() > 0) { Map map = antExcAddRequest.getBp(); - List ybjcItems = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ybjc.getId()); + List ybjcItems = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xy.getId()); if (CollectionUtils.isNotEmpty(ybjcItems)) { for (DiagnoseItemModel item : ybjcItems) { if ((double) map.get("ssy") > Double.valueOf(item.getValueOne()) && (double) map.get("ssy") < Double.valueOf(item.getValueTwo())) { @@ -3934,6 +3939,8 @@ public class AntenatalExaminationFacade { } } } + + if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.bc.getId())) { if (StringUtils.isNotEmpty(antExcAddRequest.getbChao())) { String bChao = antExcAddRequest.getbChao(); @@ -4080,11 +4087,11 @@ public class AntenatalExaminationFacade { } } } - - + } + if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.xt.getId())) { if (StringUtils.isNotEmpty(antExcAddRequest.getBloodSugar())) { // 辅助检查——血型 - List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xx.getId()); + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xt.getId()); if (CollectionUtils.isNotEmpty(items)) { //血糖 for (DiagnoseItemModel item : items) { @@ -4096,7 +4103,6 @@ public class AntenatalExaminationFacade { } } } - if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.ggn.getId())) { if (StringUtils.isNotEmpty(antExcAddRequest.getXqgbzam())) { // 辅助检查——肝功能 @@ -4171,12 +4177,13 @@ public class AntenatalExaminationFacade { } } } + } - + if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.bg.getId())) { if (StringUtils.isNotEmpty(antExcAddRequest.getBg())) { if ("yang".equals(antExcAddRequest.getBg())) { // 辅助检查——肝功能 - List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ggn.getId()); + List items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.bg.getId()); if (CollectionUtils.isNotEmpty(items)) { //丙肝——阳性(+) for (DiagnoseItemModel item : items) { @@ -4189,8 +4196,6 @@ public class AntenatalExaminationFacade { } } } - - if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.ygwx.getId())) { if (StringUtils.isNotEmpty(antExcAddRequest.getYgbmky())) { if ("yang".equals(antExcAddRequest.getYgbmky())) {