From 43ae49c0dac48f73557dfbdabf6a272e37360ddf Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Sat, 19 Feb 2022 16:03:43 +0800
Subject: [PATCH] update

---
 .../web/facade/PremaritalCheckupFacade.java        | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
index 6d4c280..6d2ccea 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
@@ -1930,7 +1930,7 @@ public class PremaritalCheckupFacade {
         checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
 
         String baseDoctor = "";
-        if (result.getBaseDoctor() != null) {
+        if (StringUtils.isNotEmpty(result.getBaseDoctor())) {
             Users users = usersService.getUsers(Integer.parseInt(result.getBaseDoctor()));
             if (users != null && users.getYn() == YnEnums.YES.getId()) {
                 baseDoctor = users.getName();
@@ -1939,7 +1939,7 @@ public class PremaritalCheckupFacade {
         checkupResult.setBaseDoctor(baseDoctor);
 
         String physiqueDoctor = "";
-        if (result.getPhysiqueDoctor() != null) {
+        if (StringUtils.isNotEmpty(result.getPhysiqueDoctor())) {
             Users users = usersService.getUsers(Integer.parseInt(result.getPhysiqueDoctor()));
             if (users != null && users.getYn() == YnEnums.YES.getId()) {
                 physiqueDoctor = users.getName();
@@ -1948,7 +1948,7 @@ public class PremaritalCheckupFacade {
         checkupResult.setPhysiqueDoctor(physiqueDoctor);
 
         String repDoctor = "";
-        if (result.getRepDoctor() != null) {
+        if (StringUtils.isNotEmpty(result.getRepDoctor())) {
             Users users = usersService.getUsers(Integer.parseInt(result.getRepDoctor()));
             if (users != null && users.getYn() == YnEnums.YES.getId()) {
                 repDoctor = users.getName();
@@ -1957,7 +1957,7 @@ public class PremaritalCheckupFacade {
         checkupResult.setRepDoctor(repDoctor);
 
         String clinicDoctor = "";
-        if (result.getClinicDoctor() != null) {
+        if (StringUtils.isNotEmpty(result.getClinicDoctor())) {
             Users users = usersService.getUsers(Integer.parseInt(result.getClinicDoctor()));
             if (users != null && users.getYn() == YnEnums.YES.getId()) {
                 clinicDoctor = users.getName();
@@ -1966,7 +1966,7 @@ public class PremaritalCheckupFacade {
         checkupResult.setClinicDoctor(clinicDoctor);
 
         String assistDoctor = "";
-        if (result.getAssistDoctor() != null) {
+        if (StringUtils.isNotEmpty(result.getAssistDoctor())) {
             Users users = usersService.getUsers(Integer.parseInt(result.getAssistDoctor()));
             if (users != null && users.getYn() == YnEnums.YES.getId()) {
                 assistDoctor = users.getName();
@@ -1975,7 +1975,7 @@ public class PremaritalCheckupFacade {
         checkupResult.setAssistDoctor(assistDoctor);
 
         String guidDoctor = "";
-        if (result.getGuidDoctor() != null) {
+        if (StringUtils.isNotEmpty(result.getGuidDoctor())) {
             Users users = usersService.getUsers(Integer.parseInt(result.getGuidDoctor()));
             if (users != null && users.getYn() == YnEnums.YES.getId()) {
                 guidDoctor = users.getName();
@@ -1984,7 +1984,7 @@ public class PremaritalCheckupFacade {
         checkupResult.setGuidDoctor(guidDoctor);
 
         String hunJianDoctor = "";
-        if (result.getHunJianDoctor() != null) {
+        if (StringUtils.isNotEmpty(result.getHunJianDoctor())) {
             Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor()));
             if (users != null && users.getYn() == YnEnums.YES.getId()) {
                 hunJianDoctor = users.getName();
@@ -2001,43 +2001,43 @@ public class PremaritalCheckupFacade {
         checkupResult.setUserSign(result.getUserSign());
 
         //查询的时候,返回医院的名称
-        if (result.getBaseHospitalId() != null) {
+        if (StringUtils.isNotEmpty(result.getBaseHospitalId())) {
             Organization organization = organizationService.getOrganization(Integer.valueOf(result.getBaseHospitalId()));
             if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                 checkupResult.setBaseHospitalId(organization.getName());
             }
         }
-        if (result.getPhysiqueHospitalId() != null) {
+        if (StringUtils.isNotEmpty(result.getPhysiqueHospitalId())) {
             Organization organization = organizationService.getOrganization(Integer.valueOf(result.getPhysiqueHospitalId()));
             if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                 checkupResult.setPhysiqueHospitalId(organization.getName());
             }
         }
-        if (result.getRepHospitalId() != null) {
+        if (StringUtils.isNotEmpty(result.getRepHospitalId())) {
             Organization organization = organizationService.getOrganization(Integer.valueOf(result.getRepHospitalId()));
             if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                 checkupResult.setRepHospitalId(organization.getName());
             }
         }
-        if (result.getClinicHospitalId() != null) {
+        if (StringUtils.isNotEmpty(result.getClinicHospitalId())) {
             Organization organization = organizationService.getOrganization(Integer.valueOf(result.getClinicHospitalId()));
             if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                 checkupResult.setClinicHospitalId(organization.getName());
             }
         }
-        if (result.getAssistHospitalId() != null) {
+        if (StringUtils.isNotEmpty(result.getAssistHospitalId())) {
             Organization organization = organizationService.getOrganization(Integer.valueOf(result.getAssistHospitalId()));
             if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                 checkupResult.setAssistHospitalId(organization.getName());
             }
         }
-        if (result.getGuidHospitalId() != null) {
+        if (StringUtils.isNotEmpty(result.getGuidHospitalId())) {
             Organization organization = organizationService.getOrganization(Integer.valueOf(result.getGuidHospitalId()));
             if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                 checkupResult.setGuidHospitalId(organization.getName());
             }
         }
-        if (result.getHospitalId() != null) {
+        if (StringUtils.isNotEmpty(result.getHospitalId())) {
             Organization organization = organizationService.getOrganization(Integer.valueOf(result.getHospitalId()));
             if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
                 checkupResult.setHunJianHospital(organization.getName());
-- 
1.8.3.1