lighter 1 年之前
父節點
當前提交
e5b57435ad

+ 3 - 0
src/main/java/thyyxxk/webserver/entity/casefrontsheet/FrontsheetQualityVerification.java

@@ -115,6 +115,9 @@ public class FrontsheetQualityVerification implements Serializable {
     }
 
     public String getStateName() {
+        if (null == auditState) {
+            return null;
+        }
         switch (auditState) {
             case APPROVED:
                 return "审核通过";

+ 6 - 2
src/main/java/thyyxxk/webserver/service/inpatient/DictionaryService.java

@@ -147,7 +147,11 @@ public class DictionaryService {
         if (res.getCode() != ExceptionEnum.SUCCESS.getCode()) {
             return res;
         }
-        return  ListUtil.isBlank(res.getData())? res : ResultVoUtil.success(res.getData().subList((param.getPage() - 1) * 10,
-                Math.min(res.getData().size(), param.getPage() * 10)));
+        if (ListUtil.isBlank(res.getData())) {
+            return res;
+        }
+        List<CodeName> list = res.getData().subList((param.getPage() - 1) * 10,
+                Math.min(res.getData().size(), param.getPage() * 10));
+        return ResultVoUtil.success(list);
     }
 }