1

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -19,6 +19,7 @@ import com.diagbot.util.*;
 import com.diagbot.vo.AnalyzeRunVO;
 import com.diagbot.vo.data.*;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -340,7 +341,7 @@ public class AHomePageFacade extends HomePageServiceImpl{
 
             HomePage homePage =new HomePage();
             BeanUtils.copyProperties(homePageVO,homePage);
-            if (homePage.getAge().equals("0")){
+            if (StringUtils.isNotBlank(homePage.getAge()) && homePage.getAge().equals("0")){
                 if (null!=homePage.getNewbornMonth() && !homePage.getNewbornMonth().equals("")){
                     homePage.setAge(homePage.getNewbornMonth());
                     homePage.setAgeUnit("月");

src/main/java/com/diagbot/facade/str/AStrFirstRecordFacade.java

@@ -29,6 +29,7 @@ import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ADeleteFlagVO;
 import com.diagbot.vo.data.FJStrAdmissionNoteVo;
 import com.diagbot.vo.data.HisViewVo;
+import org.apache.commons.lang3.StringUtils;
 import org.bouncycastle.asn1.BERApplicationSpecific;
 import com.diagbot.vo.str.StrFirstRecordVO;
 import com.google.common.collect.Lists;
@@ -181,11 +182,11 @@ public class AStrFirstRecordFacade extends StrFirstRecordServiceImpl {
         if(list!=null && list.size()>0){
             //循环验证数据有效性
             for (StrFirstRecordVO strFirstRecordVO:list) {
-                if("".equals(strFirstRecordVO.getRecId())) {
+                if(StringUtils.isBlank(strFirstRecordVO.getRecId())) {
                     return RespDTO.onError("请输入记录编号!");
                 }else if(strFirstRecordVO.getHospitalId()==null){
                     return RespDTO.onError("请输入医院编码!");
-                }else if("".equals(strFirstRecordVO.getBehospitalCode())){
+                }else if(StringUtils.isBlank(strFirstRecordVO.getBehospitalCode())){
                     return RespDTO.onError("请输入病人住院编码!");
                 }
             }

src/main/resources/application-local.yml

@@ -1,5 +1,5 @@
 server:
-  port: 5858
+  port: 5859
   max-http-header-size: 10MB
 
 hystrix:
@@ -59,7 +59,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.12.181/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.12.181/qc-test?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
       password: lt@great
       # 连接池的配置信息