diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java index 35ed7ec..8d03156 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java @@ -231,7 +231,7 @@ public class ExcelUtil } - public static void writeWhExclFile(String filePath,OutputStream out,List> values) { + public static void writeWhExclFile(String filePath,OutputStream out,List> values) { File file = new File(filePath); InputStream in = null; Workbook wb = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index b9e5033..6250f32 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -303,17 +303,17 @@ public class MatDeliverController extends BaseController{ // 这里返回的结果必然是这个泛型,之所以query返回的结果集没有用泛型是为了更好的传递数据 @SuppressWarnings("unchecked") List childbirthManagerQueryModelList = matDeliverFacade.childbirthManager(childbirthManagerRequest).getData(); - List> list = new LinkedList<>(); + List> list = new LinkedList<>(); int num = 0; for (ChildbirthManagerQueryModel queryModel : childbirthManagerQueryModelList) { Patients patients = patientsService.findOnePatientById(queryModel.getPatientId()); - Map map = new LinkedHashMap<>(); + Map map = new LinkedHashMap<>(); map.put("num",String.valueOf(num)); map.put("dueDate",queryModel.getDueDate()); map.put("fmTime",queryModel.getFmTime()); if(StringUtils.isNotEmpty(queryModel.getBhnum())){ - map.put("zyNo",queryModel.getBhnum()); + map.put("zyNo","00009"); }else { map.put("zyNo", "-"); }