From 8000fbc1a19989fcb9718a4c6d6423e15cee861e Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 27 Oct 2023 15:35:40 +0800
Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=E7=A7=91=E5=AE=A4=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../applet/ResidentPatientInfoController.java |  4 ++--
 .../impl/NurseAppLoginServiceImpl.java        | 14 +++++++++-----
 .../HospitalPersonInfoController.java         | 19 ++++++-------------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java
index d09c38e..0a00e7b 100644
--- a/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java
+++ b/xinelu-admin/src/main/java/com/xinelu/web/controller/applet/ResidentPatientInfoController.java
@@ -47,9 +47,9 @@ public class ResidentPatientInfoController extends BaseController {
     @ApiOperation("注册完善信息")
     @PostMapping("")
     public R<String> register(@Validated @RequestBody PatientInfoBody body) {
-        if(body.getDiseaseList() == null || body.getDiseaseList().size() == 0) {
+        /*if(body.getDiseaseList() == null || body.getDiseaseList().size() == 0) {
             return R.fail("请选择基础疾病");
-        }
+        }*/
         try {
             residentPatientInfoService.register(body);
             return R.ok();
diff --git a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
index 414e087..2e16a6e 100644
--- a/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
+++ b/xinelu-nurse-applet/src/main/java/com/xinelu/applet/service/nurseapplogin/impl/NurseAppLoginServiceImpl.java
@@ -183,11 +183,15 @@ public class NurseAppLoginServiceImpl implements NurseAppLoginService {
         }
         if (Objects.nonNull(patientDisease) && StringUtils.isNotBlank(patientDisease.getAreaCode())) {
             SysAreaVO codeName = sysAreaMapper.getSubordinateRegionsFindSuperiorRegions(patientDisease.getAreaCode());
-            String provinceName = StringUtils.isBlank(codeName.getProvinceName()) ? "" : codeName.getProvinceName();
-            String cityName = StringUtils.isBlank(codeName.getCityName()) ? "" : codeName.getCityName();
-            String regionName = StringUtils.isBlank(codeName.getRegionName()) ? "" : codeName.getRegionName();
-            String streetName = StringUtils.isBlank(codeName.getStreetName()) ? "" : codeName.getStreetName();
-            patientDisease.setAreaName(provinceName + cityName + regionName + streetName);
+            if (Objects.nonNull(codeName)) {
+                String provinceName = StringUtils.isBlank(codeName.getProvinceName()) ? "" : codeName.getProvinceName();
+                String cityName = StringUtils.isBlank(codeName.getCityName()) ? "" : codeName.getCityName();
+                String regionName = StringUtils.isBlank(codeName.getRegionName()) ? "" : codeName.getRegionName();
+                String streetName = StringUtils.isBlank(codeName.getStreetName()) ? "" : codeName.getStreetName();
+                patientDisease.setAreaName(provinceName + cityName + regionName + streetName);
+            } else {
+                patientDisease.setAreaName("");
+            }
         } else {
             patientDisease.setAreaName("");
         }
diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalpersoninfo/HospitalPersonInfoController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalpersoninfo/HospitalPersonInfoController.java
index b09b73e..72b016b 100644
--- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalpersoninfo/HospitalPersonInfoController.java
+++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/hospitalpersoninfo/HospitalPersonInfoController.java
@@ -15,19 +15,13 @@ import com.xinelu.manage.service.hospitalpersoninfo.IHospitalPersonInfoService;
 import com.xinelu.manage.vo.hospitalpersoninfo.HospitalPersonInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import java.util.List;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 健康咨询-科室人员信息Controller
@@ -112,7 +106,6 @@ public class HospitalPersonInfoController extends BaseController {
 
     /**
      * 修改健康咨询-科室人员信息
-     * @return
      */
     @PostMapping("/update")
     public AjaxResult update(@RequestBody HospitalPersonInfoDtoo hospitalPersonInfo) {
@@ -129,4 +122,4 @@ public class HospitalPersonInfoController extends BaseController {
     public AjaxResult remove(@PathVariable Long[] ids) {
         return hospitalPersonInfoService.deleteHospitalPersonInfoByIds(ids);
     }
-}
+}
\ No newline at end of file