From 21c632878f0d223ed646e407c2c72fe7b4476ffa Mon Sep 17 00:00:00 2001 From: zhangchao Date: Tue, 13 Aug 2024 13:40:07 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E5=84=BF=E7=AB=A5?= =?UTF-8?q?=E5=87=BA=E7=94=9F=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/controller/BirthController.java | 3 --- .../lyms/platform/operate/web/facade/PatientServiceFacade.java | 10 ++++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java index 8b13dea..43adbf9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java @@ -1,8 +1,6 @@ package com.lyms.platform.operate.web.controller; -import com.alibaba.fastjson.JSONObject; import com.lyms.platform.biz.service.ArchiveDataServicer; -import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; @@ -14,7 +12,6 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.PatientServiceFacade; import com.lyms.platform.operate.web.facade.ViewFacade; import com.lyms.platform.operate.web.result.BirthResult; -import com.lyms.platform.operate.web.vo.ArchiveUsers; import com.lyms.platform.pojo.ArchiveData; import com.lyms.platform.query.ArchiveDataQuery; import com.lyms.platform.query.PatientsQuery; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index be6a7c2..3930d45 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -1898,12 +1898,12 @@ public class PatientServiceFacade { baseResponse.setErrormsg("数据异常"); return baseResponse; } - Patients mPatients= patientsService.findOnePatientById(birthResult.getParentId()); + /* Patients mPatients= patientsService.findOnePatientById(birthResult.getParentId()); if (mPatients==null){ baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); baseResponse.setErrormsg("数据异常"); return baseResponse; - } + }*/ Patients patients=new Patients(); BeanUtils.copy(birthResult, patients); patients.setId(birthResult.getParentId()); @@ -1913,7 +1913,7 @@ public class PatientServiceFacade { for (BirthBabyResult birthBaby:babyResults){ BabyModel babyModel=new BabyModel(); if (StringUtils.isEmpty(birthBaby.getBabyId())){ - babyModel=getBabyModel(babyModel,mPatients); + // babyModel=getBabyModel(babyModel,mPatients); }else { babyModel.setId(birthBaby.getBabyId()); } @@ -1963,7 +1963,7 @@ public class PatientServiceFacade { babyModel.setBlNo(birthBaby.getBlNo()); } if (StringUtils.isEmpty(babyModel.getId())){ - babyService.addOneBaby(babyModel); + // babyService.addOneBaby(babyModel); }else { babyService.updateOneBaby(babyModel,babyModel.getId()); } @@ -2094,6 +2094,7 @@ public class PatientServiceFacade { } birthBabyResult.setFirstName(babyModel.getFirstName()); birthBabyResult.setLastName(babyModel.getLastName()); + birthBabyResult.setBabyAddress(babyModel.getBabyAddress()); list.add(birthBabyResult); } birthResult.setResultList(list); @@ -2155,6 +2156,7 @@ public class PatientServiceFacade { } birthBabyResult.setFirstName(babyModel.getFirstName()); birthBabyResult.setLastName(babyModel.getLastName()); + birthBabyResult.setBabyAddress(babyModel.getBabyAddress()); babyResults.add(birthBabyResult); } birthResult.setResultList(babyResults); -- 1.8.3.1