Commit 914a325be878730fe52787bdc30867279154d24c
1 parent
b11ea18f34
Exists in
master
and in
6 other branches
修改高危因素
Showing 2 changed files with 23 additions and 10 deletions
platform-common/src/main/java/com/lyms/platform/common/enums/DiagnoseEnums.java
View file @
914a325
| ... | ... | @@ -28,8 +28,12 @@ |
| 28 | 28 | crbs(15, "传染病史"), |
| 29 | 29 | ckjc(16, "产科检查"), |
| 30 | 30 | bc(17, "B超"), |
| 31 | - BCRSQK(18, "本次妊娠情况"); | |
| 31 | + BCRSQK(18, "本次妊娠情况"), | |
| 32 | + xy(19, "血压"), | |
| 33 | + xt(20, "血糖"), | |
| 34 | + bg(21, "丙肝"); | |
| 32 | 35 | |
| 36 | + | |
| 33 | 37 | private DiagnoseItemEnums(int id, String title) { |
| 34 | 38 | this.id = id; |
| 35 | 39 | this.title = title; |
| ... | ... | @@ -202,6 +206,8 @@ |
| 202 | 206 | //一般检查 |
| 203 | 207 | XZ(1, "心脏", 4, TypeEnums.WZ.getId(), 0, ""), |
| 204 | 208 | FB(2, "肺部", 4, TypeEnums.WZ.getId(), 0, ""), |
| 209 | + | |
| 210 | + //血压 | |
| 205 | 211 | XY(64, "血压", 19, TypeEnums.SZ.getId(), 0, ""), |
| 206 | 212 | |
| 207 | 213 | //辅助检查——血常规 |
| ... | ... | @@ -216,6 +222,7 @@ |
| 216 | 222 | /** |
| 217 | 223 | * 20190808提出来 |
| 218 | 224 | */ |
| 225 | + //血糖 | |
| 219 | 226 | XT(8, "血糖", 20, TypeEnums.SZ.getId(), 0, "mmol/L"), |
| 220 | 227 | |
| 221 | 228 | //辅助检查——肝功能 |
| ... | ... | @@ -229,6 +236,7 @@ |
| 229 | 236 | /** |
| 230 | 237 | * 20190808 剔除出来 |
| 231 | 238 | **/ |
| 239 | + //丙肝 | |
| 232 | 240 | GGNBG(14, "丙肝——阳性（+）", 21, TypeEnums.WZJ.getId(), 1, ""), |
| 233 | 241 | // 辅助检查——乙肝五项 |
| 234 | 242 | YGBMKY(15, "乙肝表面抗原——阳性（+）", 8, TypeEnums.WZJ.getId(), 1, ""), |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
914a325
| ... | ... | @@ -3919,10 +3919,15 @@ |
| 3919 | 3919 | } |
| 3920 | 3920 | } |
| 3921 | 3921 | } |
| 3922 | + | |
| 3923 | + } | |
| 3924 | + | |
| 3925 | + | |
| 3926 | + if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.xy.getId())) { | |
| 3922 | 3927 | //血压 |
| 3923 | 3928 | if (!antExcAddRequest.getBp().isEmpty() && antExcAddRequest.getBp().size() > 0) { |
| 3924 | 3929 | Map map = antExcAddRequest.getBp(); |
| 3925 | - List<DiagnoseItemModel> ybjcItems = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ybjc.getId()); | |
| 3930 | + List<DiagnoseItemModel> ybjcItems = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xy.getId()); | |
| 3926 | 3931 | if (CollectionUtils.isNotEmpty(ybjcItems)) { |
| 3927 | 3932 | for (DiagnoseItemModel item : ybjcItems) { |
| 3928 | 3933 | if ((double) map.get("ssy") > Double.valueOf(item.getValueOne()) && (double) map.get("ssy") < Double.valueOf(item.getValueTwo())) { |
| ... | ... | @@ -3934,6 +3939,8 @@ |
| 3934 | 3939 | } |
| 3935 | 3940 | } |
| 3936 | 3941 | } |
| 3942 | + | |
| 3943 | + | |
| 3937 | 3944 | if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.bc.getId())) { |
| 3938 | 3945 | if (StringUtils.isNotEmpty(antExcAddRequest.getbChao())) { |
| 3939 | 3946 | String bChao = antExcAddRequest.getbChao(); |
| 3940 | 3947 | |
| ... | ... | @@ -4080,11 +4087,11 @@ |
| 4080 | 4087 | } |
| 4081 | 4088 | } |
| 4082 | 4089 | } |
| 4083 | - | |
| 4084 | - | |
| 4090 | + } | |
| 4091 | + if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.xt.getId())) { | |
| 4085 | 4092 | if (StringUtils.isNotEmpty(antExcAddRequest.getBloodSugar())) { |
| 4086 | 4093 | // 辅助检查——血型 |
| 4087 | - List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xx.getId()); | |
| 4094 | + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.xt.getId()); | |
| 4088 | 4095 | if (CollectionUtils.isNotEmpty(items)) { |
| 4089 | 4096 | //血糖 |
| 4090 | 4097 | for (DiagnoseItemModel item : items) { |
| ... | ... | @@ -4096,7 +4103,6 @@ |
| 4096 | 4103 | } |
| 4097 | 4104 | } |
| 4098 | 4105 | } |
| 4099 | - | |
| 4100 | 4106 | if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.ggn.getId())) { |
| 4101 | 4107 | if (StringUtils.isNotEmpty(antExcAddRequest.getXqgbzam())) { |
| 4102 | 4108 | // 辅助检查——肝功能 |
| 4103 | 4109 | |
| 4104 | 4110 | |
| ... | ... | @@ -4171,12 +4177,13 @@ |
| 4171 | 4177 | } |
| 4172 | 4178 | } |
| 4173 | 4179 | } |
| 4180 | + } | |
| 4174 | 4181 | |
| 4175 | - | |
| 4182 | + if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.bg.getId())) { | |
| 4176 | 4183 | if (StringUtils.isNotEmpty(antExcAddRequest.getBg())) { |
| 4177 | 4184 | if ("yang".equals(antExcAddRequest.getBg())) { |
| 4178 | 4185 | // 辅助检查——肝功能 |
| 4179 | - List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.ggn.getId()); | |
| 4186 | + List<DiagnoseItemModel> items = mapItems.get(DiagnoseEnums.DiagnoseItemEnums.bg.getId()); | |
| 4180 | 4187 | if (CollectionUtils.isNotEmpty(items)) { |
| 4181 | 4188 | //丙肝——阳性（+） |
| 4182 | 4189 | for (DiagnoseItemModel item : items) { |
| ... | ... | @@ -4189,8 +4196,6 @@ |
| 4189 | 4196 | } |
| 4190 | 4197 | } |
| 4191 | 4198 | } |
| 4192 | - | |
| 4193 | - | |
| 4194 | 4199 | if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.ygwx.getId())) { |
| 4195 | 4200 | if (StringUtils.isNotEmpty(antExcAddRequest.getYgbmky())) { |
| 4196 | 4201 | if ("yang".equals(antExcAddRequest.getYgbmky())) { |