jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f83f12f13c5aabec472cc3d4497077ca6527b0fc

Authored by jiangjiazhi
1 parent f558994478
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

分娩作废产检劵

Showing 1 changed file with 41 additions and 55 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ f83f12f
... ... @@ -235,21 +235,13 @@
235 235 if (CollectionUtils.isEmpty(babyModels)) {
236 236 handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1, hospitalId);
237 237 } else {
238   - List<MaternalDeliverModel.Baby> babies = new ArrayList<>();
239   - for (BabyModel babyModel : babyModels) {
240   - MaternalDeliverModel.Baby baby1 = new MaternalDeliverModel.Baby(babyModel);
241   - babies.add(baby1);
242   - }
243   - maternalDeliverModel.setBaby(babies);
  238 + maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list));
244 239 }
245 240 }
246 241  
247 242 maternalDeliverModel.setHospitalId(hospitalId);
248 243 //做分娩的时候需要删除产筛数据
249   - /* SieveQuery sieveQuery = new SieveQuery();
250   - sieveQuery.setParentId(deliverAddRequest.getParentId());
251   - sieveQuery.setYn(YnEnums.YES.getId());
252   - sieveQuery.setHospitalId(hospitalId);*/
  244 +
253 245 sieveService.deleteSieve(deliverAddRequest.getParentId(), hospitalId, null);
254 246  
255 247 maternalDeliverModel.setYn(YnEnums.YES.getId());
256 248  
... ... @@ -286,51 +278,8 @@
286 278 //获取到小孩信息
287 279 List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies();
288 280 //修改小孩信息
289   - // if (CollectionUtils.isNotEmpty(list)) {
290   - // for (MatDeliverAddRequest.Baby baby : list) {
291   - // MaternalDeliverModel.Baby babyModel = baby.convertToDataModel();
292   - // //判断妊娠结局是活产才添加数据
293   - // BabyModel babyModel1=new BabyModel();
294   - // MatDeliverQuery query=new MatDeliverQuery();
295   - // query.setParentId(deliverAddRequest.getParentId());
296   - // babyModel1.setParentId(deliverAddRequest.getParentId());
297   - // if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
298   - // babyModel1.setYn(YnEnums.YES.getId());
299   - // }else{
300   - // babyModel1.setYn(YnEnums.NO.getId());
301   - // }
302   - // babyService.findAndModify(query.convertToQuery(), babyModel1);
303   - // babyList.add(babyModel);
304   - // }
305   - // maternalDeliverModel.setBaby(babyList);
306   - // }
307 281 if (CollectionUtils.isNotEmpty(list)) {
308   - for (MatDeliverAddRequest.Baby baby : list) {
309   - MaternalDeliverModel.Baby babyModel = baby.convertToDataModel();
310   - //判断妊娠结局是活产才添加数据
311   - BabyModel babyModel1=new BabyModel();
312   - MatDeliverQuery query=new MatDeliverQuery();
313   - query.setId(deliverAddRequest.getId());
314   - babyModel1.setParentId(deliverAddRequest.getParentId());
315   - if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
316   - babyModel1.setYn(YnEnums.YES.getId());
317   - }else{
318   - babyModel1.setYn(YnEnums.NO.getId());
319   - }
320   - babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime()));
321   - babyModel1.setSex(Integer.valueOf(baby.getBabyGender()));
322   - Map map = deliverAddRequest.getDeliveryMode();
323   - String fmfs = null;
324   - if (!map.isEmpty()) {
325   - fmfs = map.get("fmfs").toString();
326   - }
327   - babyModel1.setDueType(fmfs);
328   - babyModel1.setBabyHeight(baby.getBabyHeight());
329   - babyModel1.setBabyWeight(baby.getBabyWeight());
330   - babyService.findAndModify(query.convertToQuery(), babyModel1);
331   - babyList.add(babyModel);
332   - }
333   - maternalDeliverModel.setBaby(babyList);
  282 + maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list));
334 283 }
335 284  
336 285 matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
337 286  
... ... @@ -473,7 +422,44 @@
473 422 }
474 423 }
475 424  
  425 + /**
  426 + * 处理儿童变更
  427 + *
  428 + * @param deliverAddRequest
  429 + * @param list
  430 + * @return
  431 + */
  432 + private List updateBaby(MatDeliverAddRequest deliverAddRequest,List<MatDeliverAddRequest.Baby> list ){
  433 + List<MaternalDeliverModel.Baby> babyList = new ArrayList<>();
  434 + for (MatDeliverAddRequest.Baby baby : list) {
  435 + MaternalDeliverModel.Baby babyModel = baby.convertToDataModel();
  436 + //判断妊娠结局是活产才添加数据
  437 + BabyModel babyModel1=new BabyModel();
  438 + MatDeliverQuery query=new MatDeliverQuery();
  439 + query.setId(deliverAddRequest.getId());
  440 + babyModel1.setParentId(deliverAddRequest.getParentId());
  441 + if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
  442 + babyModel1.setYn(YnEnums.YES.getId());
  443 + }else{
  444 + babyModel1.setYn(YnEnums.NO.getId());
  445 + }
  446 + babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime()));
  447 + babyModel1.setSex(Integer.valueOf(baby.getBabyGender()));
  448 + Map map = deliverAddRequest.getDeliveryMode();
  449 + String fmfs = null;
  450 + if (!map.isEmpty()) {
  451 + fmfs = map.get("fmfs").toString();
  452 + }
  453 + babyModel1.setDueType(fmfs);
  454 + babyModel1.setBabyHeight(baby.getBabyHeight());
  455 + babyModel1.setBabyWeight(baby.getBabyWeight());
  456 + babyService.findAndModify(query.convertToQuery(), babyModel1);
  457 + babyList.add(babyModel);
  458 + }
  459 + return babyList;
  460 + }
476 461  
  462 +
477 463 /**
478 464 * 处理儿童
479 465 *
... ... @@ -1599,7 +1585,7 @@
1599 1585 }
1600 1586 }
1601 1587 map.put("oRiskFactor",riskFactor);
1602   - map.put("riskLevel", FunvCommonUtil.getBaseicConfigByid(patients.getRiskLevelId(),basicConfigService));
  1588 + map.put("riskLevel", FunvCommonUtil.getBaseicConfigByid(patients.getRiskLevelId(), basicConfigService));
1603 1589 map.put("riskScore",patients.getRiskScore());
1604 1590  
1605 1591 map.put("deliveryDate", data.getDueDate());