From 35f4c5f0cf86366c3c9b6e1908c35c94dba5db4e Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Wed, 7 Aug 2024 14:59:05 +0800
Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=87=BA=E7=94=9F?=
 =?UTF-8?q?=E8=AF=81=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/BirthController.java    |  2 +-
 .../operate/web/facade/PatientServiceFacade.java   | 65 +++++++++++++++++-----
 2 files changed, 52 insertions(+), 15 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 91f0d2e..b23f80b 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
@@ -57,7 +57,7 @@ public class BirthController extends BaseController {
 
     @RequestMapping(value = "/wx/update", method = RequestMethod.POST)
     @ResponseBody
-    public BaseResponse update(@RequestBody BirthResult birthResult){
+    public BaseResponse update(BirthResult birthResult){
         return patientServiceFacade.updatePuerpera(birthResult);
     }
 
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 5079171..679dcbd 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
@@ -1893,26 +1893,63 @@ public class PatientServiceFacade {
 
     public BaseResponse updatePuerpera(BirthResult birthResult){
         BaseResponse baseResponse = new BaseResponse();
+        if (StringUtils.isEmpty(birthResult.getParentId())||StringUtils.isEmpty(birthResult.getBabyId())){
+            baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
+            baseResponse.setErrormsg("数据异常");
+            return baseResponse;
+        }
         Patients patients=new Patients();
         BeanUtils.copy(birthResult, patients);
         patients.setId(birthResult.getParentId());
         patientsService.updatePatient(patients);
         BabyModel babyModel=new BabyModel();
         babyModel.setId(birthResult.getBabyId());
-        babyModel.setWeek(birthResult.getBabyWeek());
-        babyModel.setBabyHeight(birthResult.getBabyHeight());
-        babyModel.setBabyWeight(birthResult.getBabyWeight());
-        babyModel.setDeliverOrg(birthResult.getDeliverOrg());
-        babyModel.setSex(birthResult.getBabySex());
-        babyModel.setName(birthResult.getBabyName());
-        babyModel.setFirstName(birthResult.getFirstName());
-        babyModel.setLastName(birthResult.getLastName());
-        babyModel.setBabyAddress(birthResult.getBabyAddress());
-        babyModel.setBabyStreetId(birthResult.getBabyStreetId());
-        babyModel.setBabyProvinceId(birthResult.getProvinceId());
-        babyModel.setBabyCityId(birthResult.getBabyCityId());
-        babyModel.setBabyAreaId(birthResult.getBabyAreaId());
-        babyModel.setBabyVillageId(birthResult.getBabyVillageId());
+        if (StringUtils.isNotEmpty(birthResult.getBabyWeek())){
+            babyModel.setWeek(birthResult.getBabyWeek());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getBabyHeight())){
+            babyModel.setBabyHeight(birthResult.getBabyHeight());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getBabyWeight())){
+            babyModel.setBabyWeight(birthResult.getBabyWeight());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getDeliverOrg())){
+            babyModel.setDeliverOrg(birthResult.getDeliverOrg());
+        }
+        if (birthResult.getBabySex()!=null){
+            babyModel.setSex(birthResult.getBabySex());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getBabyName())){
+            babyModel.setName(birthResult.getBabyName());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getFirstName())){
+            babyModel.setFirstName(birthResult.getFirstName());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getLastName())){
+            babyModel.setLastName(birthResult.getLastName());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getBabyAddress())){
+            babyModel.setBabyAddress(birthResult.getBabyAddress());
+        }
+        if(StringUtils.isNotEmpty(birthResult.getBabyStreetId())){
+            babyModel.setBabyStreetId(birthResult.getBabyStreetId());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getProvinceId())){
+            babyModel.setBabyProvinceId(birthResult.getProvinceId());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getBabyCityId())){
+            babyModel.setBabyCityId(birthResult.getBabyCityId());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getBabyAreaId())){
+            babyModel.setBabyAreaId(birthResult.getBabyAreaId());
+        }
+        if(StringUtils.isNotEmpty(birthResult.getBabyVillageId())){
+            babyModel.setBabyVillageId(birthResult.getBabyVillageId());
+        }
+        if (StringUtils.isNotEmpty(birthResult.getBlNo())){
+            babyModel.setBlNo(birthResult.getBlNo());
+        }
+
         babyService.updateOneBaby(babyModel,babyModel.getId());
         baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
         baseResponse.setErrormsg("成功");
-- 
1.8.3.1