Pārlūkot izejas kodu

修复越界异常

lighter 6 mēneši atpakaļ
vecāks
revīzija
413e28d1f1

+ 7 - 2
src/main/java/thyyxxk/webserver/service/inpatient/casefrontsheet/CaseFrontSheetExportService.java

@@ -53,10 +53,15 @@ public class CaseFrontSheetExportService {
             sheet.setDisdiagList(selectDiags(sheet.getBah(), sheet.getAdmissTimes()));
             sheet.setZyDismissWay(DismissWay.getWjwCodeByHisCode(sheet.getZyDismissWay()));
             sheet.setHbsAg(Hbsag.getWjwCodeByHisCode(sheet.getHbsAg()));
-            String ntvplc = sheet.getNativePlace().substring(0, 2);
             sheet.setPayMethod(filterPayMethod(sheet.getPayMethod(), sheet.getSocialNo()));
             sheet.setRh(filterRh(sheet.getRh()));
-            sheet.setNativePlace(Provinces.getWjwCodeByHisCode(ntvplc));
+
+            String orintv = sheet.getNativePlace();
+            if (StringUtil.notBlank(orintv) && orintv.length() > 1) {
+                String ntvplc = sheet.getNativePlace().substring(0, 2);
+                sheet.setNativePlace(Provinces.getWjwCodeByHisCode(ntvplc));
+            }
+
             sheet.setCountry(redis.getCountryName(sheet.getCountry()));
             sheet.setAdmissDeptCode(redis.getWjwDepartment(sheet.getAdmissDeptCode()));
             sheet.setZkWardCode(redis.getWjwDepartment(sheet.getZkWardCode()));