diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 5883f6d..df97b90 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -192,6 +192,9 @@ public class BabyBookbuildingFacade { @Autowired private BabyEarFacade babyEarFacade; + @Autowired + private MatDeliverFacade matDeliverFacade;//分娩记录 + public BaseResponse getBabyBase(String babyId) { //查询儿童的基本信息 BabyBasicResult base = new BabyBasicResult(); @@ -5597,9 +5600,9 @@ public class BabyBookbuildingFacade { List datas = new ArrayList <>(); if (CollectionUtils.isNotEmpty(babyModels)) { for (BabyModel model : babyModels) { - if (model.getYn() == null || model.getYn() == 1) { - continue; - } +// if (model.getYn() == null || model.getYn() == 1) { +// continue; +// } Map data = new HashMap(); data.put("id", model.getId()); data.put("phone", model.getMphone()); @@ -5610,6 +5613,7 @@ public class BabyBookbuildingFacade { data.put("sex", model.getSex()); data.put("vcCardNo", model.getVcCardNo()); data.put("sINCard", model.getsINCard()); + datas.add(data); } } @@ -5707,6 +5711,35 @@ public class BabyBookbuildingFacade { createBabyCheck(babyModelDb, appRequest.getDiseases()); } + List bLst=this.mongoTemplate.find(new Query(Criteria.where("mphone").is(appRequest.getPhone())),BabyModel.class); + if(bLst.size()>0){ + babyModelDb=bLst.get(0); + } + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setId(babyModelDb.getParentId()); + List patients = patientsService.queryPatient(patientsQuery); + + if (CollectionUtils.isNotEmpty(patients)) { + Patients p1=patients.get(0); + p1.setBirth(DateUtil.parseYMD(appRequest.getmBirth())); + patientsService.updatePatient(p1); + + MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel(); + maternalDeliverModel.setParentId(p1.getId()); + + maternalDeliverModel.setDueWeek(appRequest.getDulWeek()); + maternalDeliverModel.setDueCount(Integer.parseInt(appRequest.getChan())); + maternalDeliverModel.setTireNumber(Integer.parseInt(appRequest.getTai())); + maternalDeliverModel.setFmType(appRequest.getFmtype()); + + } + + babyModelDb.setBabyWeight(appRequest.getWeight()); + babyModelDb.setBabyHeight(appRequest.getHeight()); + babyModelDb.setAddress(appRequest.getAddr()); + babyModelDb.setBabyDiagnosis(appRequest.getCyzdnr()); + babyService.updateOneBaby(babyModelDb,babyModelDb.getId()); + return new BaseObjectResponse() .setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(babyModelDb.getEncoded()); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAppBuildAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAppBuildAddRequest.java index bb62a26..cf771b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAppBuildAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyAppBuildAddRequest.java @@ -23,6 +23,88 @@ public class BabyAppBuildAddRequest { private String vcCardNo; private String hospitalId; + private String mBirth;//母亲出生日期 + private String dulWeek;//分娩孕周 + private String tai;//胎 + private String chan;//产 + private String fmtype;//分娩方式 + private String cyzdnr;//出院诊断内容 + private String weight; + private String height; + private String addr; + + public String getmBirth() { + return mBirth; + } + + public void setmBirth(String mBirth) { + this.mBirth = mBirth; + } + + public String getDulWeek() { + return dulWeek; + } + + public void setDulWeek(String dulWeek) { + this.dulWeek = dulWeek; + } + + public String getTai() { + return tai; + } + + public void setTai(String tai) { + this.tai = tai; + } + + public String getChan() { + return chan; + } + + public void setChan(String chan) { + this.chan = chan; + } + + public String getFmtype() { + return fmtype; + } + + public void setFmtype(String fmtype) { + this.fmtype = fmtype; + } + + public String getCyzdnr() { + return cyzdnr; + } + + public void setCyzdnr(String cyzdnr) { + this.cyzdnr = cyzdnr; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public String getAddr() { + return addr; + } + + public void setAddr(String addr) { + this.addr = addr; + } + private String doctorId; //儿童疾病 private List diseases;