|
|
@@ -62,7 +62,7 @@ public class CaseFrontSheetExportService {
|
|
|
sheet.setDisdiagList(selectDiags(sheet.getBah(), sheet.getAdmissTimes()));
|
|
|
sheet.setZyDismissWay(DismissWay.getWjwCodeByHisCode(sheet.getZyDismissWay()));
|
|
|
sheet.setHbsAg(Hbsag.getWjwCodeByHisCode(sheet.getHbsAg()));
|
|
|
- sheet.setPayMethod(filterPayMethod(sheet.getPayMethod(), sheet.getSocialNo()));
|
|
|
+ sheet.setPayMethod(filterPayMethod(sheet.getPayMethod()));
|
|
|
sheet.setRh(filterRh(sheet.getRh()));
|
|
|
|
|
|
String orintv = sheet.getNativePlace();
|
|
|
@@ -120,18 +120,11 @@ public class CaseFrontSheetExportService {
|
|
|
return surgeries;
|
|
|
}
|
|
|
|
|
|
- private String filterPayMethod(String method, String idNumber) {
|
|
|
+ private String filterPayMethod(String method) {
|
|
|
if (StringUtil.isBlank(method)) {
|
|
|
return "9";
|
|
|
}
|
|
|
- int tempVal = Integer.parseInt(method);
|
|
|
- if (tempVal > 3) {
|
|
|
- return method;
|
|
|
- }
|
|
|
- if (idNumber.startsWith("4301")) {
|
|
|
- return method + ".1";
|
|
|
- }
|
|
|
- return method + ".2";
|
|
|
+ return method;
|
|
|
}
|
|
|
|
|
|
private String filterRh(String rh) {
|