jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 403bff401fb9b7c86a70c44802c29948cd9be644

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

分娩作废产检劵

Showing 1 changed file with 29 additions and 22 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 403bff4
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.platform.biz.service.*;
4 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
  5 +import com.lyms.platform.common.constants.TimeConstants;
5 6 import com.lyms.platform.common.enums.*;
6 7 import com.lyms.platform.common.result.BaseObjectResponse;
7 8 import com.lyms.platform.common.result.BaseResponse;
... ... @@ -265,7 +266,8 @@
265 266 Patients pa=patientsService.findOnePatientById(deliverAddRequest.getParentId());
266 267 patientCheckTicketQuery.setStatus(1);
267 268 patientCheckTicketQuery.setCreatedStart(pa.getLastMenses());
268   - patientCheckTicketQuery.setCreatedEnd(pa.getFmDate());
  269 + //分娩时间加一天 因为产检劵创建时间是具体到分，分娩时间只到日期
  270 + patientCheckTicketQuery.setCreatedEnd(new Date(pa.getFmDate().getTime()+ 86398000));
269 271 patientCheckTicketQuery.setPid(pa.getPid());
270 272 PatientCheckTicket patientCheckTicket=new PatientCheckTicket();
271 273 patientCheckTicket.setStatus(3);
272 274  
... ... @@ -324,28 +326,33 @@
324 326 if (CollectionUtils.isNotEmpty(list)) {
325 327 for (MatDeliverAddRequest.Baby baby : list) {
326 328 MaternalDeliverModel.Baby babyModel = baby.convertToDataModel();
327   - //判断妊娠结局是活产才添加数据
328   - BabyModel babyModel1 = new BabyModel();
329   - MatDeliverQuery query = new MatDeliverQuery();
330   - query.setId(deliverAddRequest.getId());
331   - babyModel1.setParentId(deliverAddRequest.getParentId());
332   - if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
333   - babyModel1.setYn(YnEnums.YES.getId());
334   - } else {
335   - babyModel1.setYn(YnEnums.NO.getId());
  329 +
  330 + //表示修改了新生儿
  331 + if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getId())){
  332 + //判断妊娠结局是活产才添加数据
  333 + BabyModel babyModel1 = new BabyModel();
  334 + BabyModelQuery query = new BabyModelQuery();
  335 + query.setParentId(deliverAddRequest.getParentId());
  336 + query.setId(babyModel.getId());
  337 +
  338 + if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) {
  339 + babyModel1.setYn(YnEnums.YES.getId());
  340 + } else {
  341 + babyModel1.setYn(YnEnums.NO.getId());
  342 + }
  343 + babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime()));
  344 + babyModel1.setSex(Integer.valueOf(baby.getBabyGender()));
  345 + Map map = deliverAddRequest.getDeliveryMode();
  346 + String fmfs = null;
  347 + if (!map.isEmpty()) {
  348 + fmfs = map.get("fmfs").toString();
  349 + }
  350 + babyModel1.setDueType(fmfs);
  351 + babyModel1.setBabyHeight(baby.getBabyHeight());
  352 + babyModel1.setBabyWeight(baby.getBabyWeight());
  353 + babyService.findAndModify(query.convertToQuery(), babyModel1);
  354 + babyList.add(babyModel);
336 355 }
337   - babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime()));
338   - babyModel1.setSex(Integer.valueOf(baby.getBabyGender()));
339   - Map map = deliverAddRequest.getDeliveryMode();
340   - String fmfs = null;
341   - if (!map.isEmpty()) {
342   - fmfs = map.get("fmfs").toString();
343   - }
344   - babyModel1.setDueType(fmfs);
345   - babyModel1.setBabyHeight(baby.getBabyHeight());
346   - babyModel1.setBabyWeight(baby.getBabyWeight());
347   - babyService.findAndModify(query.convertToQuery(), babyModel1);
348   - babyList.add(babyModel);
349 356 }
350 357 maternalDeliverModel.setBaby(babyList);
351 358 }