Commit 08b4c3f78224fb0e7a34fee3bc70c5600f849816
1 parent
9cd9c6906c
Exists in
master
and in
6 other branches
儿童建档
Showing 2 changed files with 131 additions and 17 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
08b4c3f
... | ... | @@ -2301,9 +2301,9 @@ |
2301 | 2301 | // 省 |
2302 | 2302 | babyQuery.setProvinceId(StringUtils.isEmpty(request.getProvinceId())?null:request.getProvinceId()); |
2303 | 2303 | // 市 |
2304 | - babyQuery.setCityId(StringUtils.isEmpty(request.getCityId())?null:request.getCityId()); | |
2304 | + babyQuery.setCityId(StringUtils.isEmpty(request.getCityId()) ? null : request.getCityId()); | |
2305 | 2305 | // 区/县 |
2306 | - babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId())?null:request.getAreaId()); | |
2306 | + babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId()) ? null : request.getAreaId()); | |
2307 | 2307 | |
2308 | 2308 | babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId()); |
2309 | 2309 | babyQuery.setQueryNo(request.getQueryNo()); |
2310 | 2310 | |
... | ... | @@ -2451,11 +2451,17 @@ |
2451 | 2451 | //获取最近一次的建档记录 |
2452 | 2452 | List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery); |
2453 | 2453 | //去掉删除的数据 |
2454 | - removeDeleted(models); | |
2454 | + models = removeDeleted(models); | |
2455 | 2455 | if (CollectionUtils.isNotEmpty(models)) { |
2456 | 2456 | BabyModel babyModel = models.get(0); |
2457 | 2457 | |
2458 | 2458 | result = new BabyBuildResult(); |
2459 | + | |
2460 | + if (babyModel.getDataStatus() != null && babyModel.getDataStatus() == 1) | |
2461 | + { | |
2462 | + result.setId(babyModel.getId()); | |
2463 | + } | |
2464 | + | |
2459 | 2465 | result.setYn(babyModel.getYn()); |
2460 | 2466 | result.setDataStatus(babyModel.getDataStatus()); |
2461 | 2467 | result.setMommyName(babyModel.getMname()); |
2462 | 2468 | |
2463 | 2469 | |
... | ... | @@ -2523,14 +2529,17 @@ |
2523 | 2529 | * 移除yn为0 的 |
2524 | 2530 | * @param babyModels |
2525 | 2531 | */ |
2526 | - private void removeDeleted(List<BabyModel> babyModels){ | |
2532 | + private List<BabyModel> removeDeleted(List<BabyModel> babyModels){ | |
2533 | + List<BabyModel> results = new ArrayList<>(); | |
2527 | 2534 | if(CollectionUtils.isNotEmpty(babyModels)){ |
2528 | - for(int i=0;i<babyModels.size();i++){ | |
2529 | - if((YnEnums.NO.getId()+"").equals(babyModels.get(i).getYn()+"")){ | |
2530 | - babyModels.remove(i); | |
2531 | - } | |
2535 | + for(BabyModel model : results){ | |
2536 | + if (model.getYn() == YnEnums.YES.getId() || (model.getYn() == YnEnums.NO.getId() && model.getDataStatus() != null && model.getDataStatus() == 1)) | |
2537 | + { | |
2538 | + results.add(model); | |
2539 | + } | |
2532 | 2540 | } |
2533 | 2541 | } |
2542 | + return results; | |
2534 | 2543 | } |
2535 | 2544 | |
2536 | 2545 | public void exportChilds(BabyManageRequest request, Integer userId, HttpServletResponse httpServletResponse) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java
View file @
08b4c3f
... | ... | @@ -75,6 +75,9 @@ |
75 | 75 | private DoctorUserMapService doctorUserMapService; |
76 | 76 | |
77 | 77 | |
78 | + private static Map<String,String> WEIGHT_RANGE = new HashMap<>(); | |
79 | + | |
80 | + | |
78 | 81 | private static Map<String,String> N_S_AREA = new HashMap<>(); |
79 | 82 | static |
80 | 83 | { |
... | ... | @@ -111,6 +114,101 @@ |
111 | 114 | N_S_AREA.put("吉林省","北方"); |
112 | 115 | N_S_AREA.put("黑龙江省","北方"); |
113 | 116 | N_S_AREA.put("宁夏回族自治区","北方"); |
117 | + | |
118 | + | |
119 | + | |
120 | + WEIGHT_RANGE.put("BMI<18.5孕0-12周","1.00-1.50"); | |
121 | + WEIGHT_RANGE.put("BMI<18.5孕13周","1.41-2.09"); | |
122 | + WEIGHT_RANGE.put("BMI<18.5孕14周","1.82-2.68"); | |
123 | + WEIGHT_RANGE.put("BMI<18.5孕15周","2.23-3.27"); | |
124 | + WEIGHT_RANGE.put("BMI<18.5孕16周","2.64-3.86"); | |
125 | + WEIGHT_RANGE.put("BMI<18.5孕17周","3.05-4.45"); | |
126 | + WEIGHT_RANGE.put("BMI<18.5孕18周","3.46-5.04"); | |
127 | + WEIGHT_RANGE.put("BMI<18.5孕19周","3.87-5.63"); | |
128 | + WEIGHT_RANGE.put("BMI<18.5孕20周","4.28-6.22"); | |
129 | + WEIGHT_RANGE.put("BMI<18.5孕21周","4.69-6.81"); | |
130 | + WEIGHT_RANGE.put("BMI<18.5孕22周","5.10-7.40"); | |
131 | + WEIGHT_RANGE.put("BMI<18.5孕23周","5.51-7.99"); | |
132 | + WEIGHT_RANGE.put("BMI<18.5孕24周","5.92-8.58"); | |
133 | + WEIGHT_RANGE.put("BMI<18.5孕25周","6.33-9.17"); | |
134 | + WEIGHT_RANGE.put("BMI<18.5孕26周","6.74-9.76"); | |
135 | + WEIGHT_RANGE.put("BMI<18.5孕27周","7.15-10.35"); | |
136 | + WEIGHT_RANGE.put("BMI<18.5孕28周","7.56-10.94"); | |
137 | + WEIGHT_RANGE.put("BMI<18.5孕29周","7.97-11.53"); | |
138 | + WEIGHT_RANGE.put("BMI<18.5孕30周","8.38-12.12"); | |
139 | + WEIGHT_RANGE.put("BMI<18.5孕31周","8.79-12.71"); | |
140 | + WEIGHT_RANGE.put("BMI<18.5孕32周","9.20-13.30"); | |
141 | + WEIGHT_RANGE.put("BMI<18.5孕33周","9.61-13.89"); | |
142 | + WEIGHT_RANGE.put("BMI<18.5孕34周","10.02-14.48"); | |
143 | + WEIGHT_RANGE.put("BMI<18.5孕35周","10.43-15.07"); | |
144 | + WEIGHT_RANGE.put("BMI<18.5孕36周","10.84-15.66"); | |
145 | + WEIGHT_RANGE.put("BMI<18.5孕37周","11.25-16.25"); | |
146 | + WEIGHT_RANGE.put("BMI<18.5孕38周","11.66-16.84"); | |
147 | + WEIGHT_RANGE.put("BMI<18.5孕39周","12.07-17.43"); | |
148 | + WEIGHT_RANGE.put("BMI<18.5孕40周","12.50-18.00"); | |
149 | + | |
150 | + | |
151 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕0-12周","1.00-1.50"); | |
152 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕13周","1.37-2.02"); | |
153 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕14周","1.75-2.54"); | |
154 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕15周","2.12-3.06"); | |
155 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕16周","2.50-3.58"); | |
156 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕17周","2.87-4.10"); | |
157 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕18周","3.25-4.62"); | |
158 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕19周","3.62-5.14"); | |
159 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕20周","4.00-5.66"); | |
160 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕21周","4.37-6.18"); | |
161 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕22周","4.75-6.70"); | |
162 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕23周","5.12-7.22"); | |
163 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕24周","5.50-7.74"); | |
164 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕25周","5.87-8.26"); | |
165 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕26周","6.25-8.78"); | |
166 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕27周","6.62-9.30"); | |
167 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕28周","7.00-9.82"); | |
168 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕29周","7.37-10.34"); | |
169 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕30周","7.75-10.86"); | |
170 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕31周","8.12-11.38"); | |
171 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕32周","8.50-11.90"); | |
172 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕33周","8.87-12.42"); | |
173 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕34周","9.25-12.94"); | |
174 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕35周","9.62-13.46"); | |
175 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕36周","10.00-13.98"); | |
176 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕37周","10.37-14.50"); | |
177 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕38周","10.75-15.02"); | |
178 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕39周","11.12-15.54"); | |
179 | + WEIGHT_RANGE.put("BMI=18.5-24.9孕40周","11.50-16.00"); | |
180 | + | |
181 | + | |
182 | + WEIGHT_RANGE.put("BMI=25-29.9孕0-12周","1.00-1.50"); | |
183 | + WEIGHT_RANGE.put("BMI=25-29.9孕13周","1.21-1.86"); | |
184 | + WEIGHT_RANGE.put("BMI=25-29.9孕14周","1.42-2.22"); | |
185 | + WEIGHT_RANGE.put("BMI=25-29.9孕15周","1.64-2.58"); | |
186 | + WEIGHT_RANGE.put("BMI=25-29.9孕16周","1.85-2.94"); | |
187 | + WEIGHT_RANGE.put("BMI=25-29.9孕17周","2.07-3.30"); | |
188 | + WEIGHT_RANGE.put("BMI=25-29.9孕18周","2.28-3.66"); | |
189 | + WEIGHT_RANGE.put("BMI=25-29.9孕19周","2.49-4.02"); | |
190 | + WEIGHT_RANGE.put("BMI=25-29.9孕20周","2.71-4.38"); | |
191 | + WEIGHT_RANGE.put("BMI=25-29.9孕21周","2.92-4.74"); | |
192 | + WEIGHT_RANGE.put("BMI=25-29.9孕22周","3.14-5.10"); | |
193 | + WEIGHT_RANGE.put("BMI=25-29.9孕23周","3.35-5.46"); | |
194 | + WEIGHT_RANGE.put("BMI=25-29.9孕24周","3.56-5.82"); | |
195 | + WEIGHT_RANGE.put("BMI=25-29.9孕25周","3.78-6.18"); | |
196 | + WEIGHT_RANGE.put("BMI=25-29.9孕26周","3.99-6.54"); | |
197 | + WEIGHT_RANGE.put("BMI=25-29.9孕27周","4.21-6.90"); | |
198 | + WEIGHT_RANGE.put("BMI=25-29.9孕28周","4.42-7.26"); | |
199 | + WEIGHT_RANGE.put("BMI=25-29.9孕29周","4.63-7.62"); | |
200 | + WEIGHT_RANGE.put("BMI=25-29.9孕30周","4.85-7.98"); | |
201 | + WEIGHT_RANGE.put("BMI=25-29.9孕31周","5.06-8.34"); | |
202 | + WEIGHT_RANGE.put("BMI=25-29.9孕32周","5.28-8.70"); | |
203 | + WEIGHT_RANGE.put("BMI=25-29.9孕33周","5.49-9.06"); | |
204 | + WEIGHT_RANGE.put("BMI=25-29.9孕34周","5.70-9.42"); | |
205 | + WEIGHT_RANGE.put("BMI=25-29.9孕35周","5.92-9.78"); | |
206 | + WEIGHT_RANGE.put("BMI=25-29.9孕36周","6.13-10.14"); | |
207 | + WEIGHT_RANGE.put("BMI=25-29.9孕37周","6.35-10.50"); | |
208 | + WEIGHT_RANGE.put("BMI=25-29.9孕38周","6.56-10.86"); | |
209 | + WEIGHT_RANGE.put("BMI=25-29.9孕39周","6.77-11.22"); | |
210 | + WEIGHT_RANGE.put("BMI=25-29.9孕40周","7.00-11.50"); | |
211 | + | |
114 | 212 | } |
115 | 213 | |
116 | 214 | |
117 | 215 | |
118 | 216 | |
119 | 217 | |
120 | 218 | |
121 | 219 | |
122 | 220 | |
123 | 221 | |
... | ... | @@ -1356,28 +1454,35 @@ |
1356 | 1454 | //基础kcal值 |
1357 | 1455 | int basekul = (week > 12 && week <= 27) ? 340 : 450; |
1358 | 1456 | |
1359 | - double avge = 0; | |
1457 | + | |
1458 | + String bmiStr = ""; | |
1360 | 1459 | if (bmi < 18.5) |
1361 | 1460 | { |
1362 | - avge = 0.51; | |
1461 | + bmiStr = "BMI<18.5孕"+week+"周"; | |
1363 | 1462 | } |
1364 | 1463 | else if (bmi <= 24.9 && bmi >= 18.5) |
1365 | 1464 | { |
1366 | - avge = 0.42; | |
1465 | + bmiStr = "BMI=18.5-24.9孕"+week+"周"; | |
1367 | 1466 | } |
1368 | 1467 | else if (bmi <= 29.9 && bmi >= 25) |
1369 | 1468 | { |
1370 | - avge = 0.28; | |
1469 | + bmiStr = "BMI=25-29.9孕"+week+"周"; | |
1371 | 1470 | } |
1372 | - else if (bmi >= 30) | |
1471 | + | |
1472 | + if (StringUtils.isEmpty(bmiStr)) | |
1373 | 1473 | { |
1374 | - avge = 0.22; | |
1474 | + return map; | |
1375 | 1475 | } |
1376 | 1476 | |
1377 | - int rangeweek = week - 12; | |
1477 | + String[] rangeWeight = WEIGHT_RANGE.get(bmiStr).split("-"); | |
1378 | 1478 | |
1379 | - double addWeightStart = 1 + rangeweek*avge; | |
1380 | - double addWeightEnd = 1.5 + rangeweek*avge; | |
1479 | + if (rangeWeight == null || rangeWeight.length != 2) | |
1480 | + { | |
1481 | + return map; | |
1482 | + } | |
1483 | + | |
1484 | + double addWeightStart = Double.parseDouble(rangeWeight[0]); | |
1485 | + double addWeightEnd = Double.parseDouble(rangeWeight[1]); | |
1381 | 1486 | |
1382 | 1487 | double kstart = (beforeWeight + addWeightStart) * 25 + basekul; |
1383 | 1488 | double kend = (beforeWeight + addWeightEnd) * 25 + basekul; |