jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 22bb3a47bad42d6f7148c4036ea759b282783d44

Authored by landong2015
2 parents 885586bd4e e1504baed2
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java View file @ 22bb3a4
... ... @@ -117,9 +117,8 @@
117 117 typeList.add(1);
118 118 typeList.add(3);
119 119 patientsQuery.setBuildTypeNot(1);
120   - patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId()));
  120 + // patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(dischargeAbstractSaveRequest.getOperatorId()));
121 121 patientsQuery.setTypeList(typeList);
122   - patientsQuery.setSort("lastMenses");
123 122 patientsQuery.setCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getCardNo()) ? null : dischargeAbstractSaveRequest.getCardNo());
124 123 patientsQuery.setVcCardNo(StringUtils.isEmpty(dischargeAbstractSaveRequest.getVcCardNo()) ? null : dischargeAbstractSaveRequest.getVcCardNo());
125 124 List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
... ... @@ -144,7 +143,15 @@
144 143 return dischargeAbstractQueryResult;
145 144 }
146 145  
147   - if (org.apache.commons.lang.StringUtils.isEmpty(patients.getFmHospital())) {
  146 + boolean flag = false;
  147 + for (Patients each : patientsList) {
  148 + if (org.apache.commons.lang.StringUtils.isNotEmpty(each.getFmHospital())) {
  149 + patients = each;
  150 + flag = true;
  151 + break;
  152 + }
  153 + }
  154 + if (!flag) {
148 155 dischargeAbstractQueryResult.setStatus("4");
149 156 dischargeAbstractQueryResult.setErrormsg("未已录入分娩信息不可进行出院小结");
150 157 return dischargeAbstractQueryResult;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 22bb3a4
... ... @@ -283,8 +283,7 @@
283 283 List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies();
284 284 //修改小孩信息
285 285 if (CollectionUtils.isNotEmpty(list)) {
286   - maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients2.getLastMenses()
287   - ));
  286 + maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients2.getLastMenses()));
288 287 }
289 288  
290 289 matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
... ... @@ -478,6 +477,27 @@
478 477 }
479 478 babyModel1.setBabyHeight(baby.getBabyHeight());
480 479 babyModel1.setBabyWeight(baby.getBabyWeight());
  480 +
  481 + babyModel1.setDeliverOrg(deliverAddRequest.getFmHospital());
  482 + babyModel1.setBirth(DateUtil.parseYMDHM(baby.getDueTime()));
  483 +
  484 + babyModel1.setDueType(fmfs);
  485 + babyModel1.setVisitstatus(VisitStatusEnums.UNVISIT.getId());
  486 + babyModel1.setAsphyxiaM(baby.getAsphyxiaM());
  487 + babyModel1.setFetusCount(deliverAddRequest.getTireNumber() + "");
  488 + if (null != baby.getBabyGender()) {
  489 + babyModel1.setSex(Integer.valueOf(baby.getBabyGender()));
  490 + }
  491 +
  492 + babyModel1.setApgarScore(JsonUtil.obj2JsonString(baby.getApgarScore()));
  493 + babyModel1.setBabyHealthy(baby.getBabyHealthy());
  494 + babyModel1.setBabyWeight(com.lyms.platform.common.utils.StringUtils.cutBabyWeight(baby.getBabyWeight()));
  495 + babyModel1.setBabyHeight(baby.getBabyHeight());
  496 + babyModel1.setMalformation(baby.getDeformity());
  497 + babyModel1.setPregnancyOut(baby.getPregnancyOut());
  498 + babyModel1.setContactM(baby.getContactM());
  499 + babyModel1.setContactStartM(baby.getContactStartM());
  500 + babyModel1.setEarlySuck(baby.getEarlySuck());
481 501 babyService.findAndModify(query.convertToQuery(), babyModel1);
482 502 }
483 503 babyList.add(babyModel);