健壮处理

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -563,10 +563,10 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         List<HomeDiagnoseInfo> homePageList = new ArrayList<>();
         List<HomeOperationInfo> homeOperationInfoList = new ArrayList<>();
         if (homePage != null) {
+            String ageData = homePage.getAge();
         try {
             if(StringUtils.isNotEmpty(homePage.getAge())&&"-".equals(homePage.getAge())==false&&"—".equals(homePage.getAge())==false){
                 //兼容数据库出现 .03岁数据 作后期判断处理
-                String ageData = homePage.getAge();
                 String ageUnitString = homePage.getAgeUnit() == null ? "" : homePage.getAgeUnit();
                 if(homePage.getAge().contains(".")&&"岁".equals(ageUnitString)){
                     String ageString = homePage.getAge().split("\\.")[0];
@@ -600,14 +600,14 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     homePage.setNewbornMonth("-");
                     homePage.setNewbornDay("-");
                 }
-                homePage.setAge(ageData+(StringUtils.isEmpty(homePage.getAgeUnit())==true ? "":homePage.getAgeUnit()));
-
             }
         } catch (Exception e) {
             System.out.println("年龄解析出错" + e);
         }
+            homePage.setAge(ageData+(StringUtils.isEmpty(homePage.getAgeUnit())==true ? "":homePage.getAgeUnit()));
             //去掉年龄单位
             homePage.setAgeUnit("");
+
             // 获取首页出院诊断、病理诊断
             homePageList = homeDiagnoseInfoFacade.list(new QueryWrapper<HomeDiagnoseInfo>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -9025,7 +9025,7 @@
         t1.gmt_create AS gradeTime,
         t1.diagnose,
         t1.ward_name AS wardName,
-        t2.age,
+        IF(t2.age is null, null,CONCAT( t2.age,IF(t2.age_unit is null, "",t2.age_unit)))as age,
         t1.file_code AS fileCode,
         t1.checkStatus,
         t1.mrStatus,