diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 44a506b..0174ea8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -2957,14 +2957,16 @@ public class MatDeliverFacade { if (CollectionUtils.isNotEmpty(futures)) { for (Future f : futures) { try { - + f.get(); childbirthManagerQueryModelList.addAll((List ) f.get()); } catch (Exception e) { ExceptionUtils.catchException(e, "fm list error."); } } } - + for (ChildbirthManagerQueryModel result : childbirthManagerQueryModelList){ + result.setCreatedWeek(result.getQqybuild()); + } childbirthManagerResult.setData(childbirthManagerQueryModelList); childbirthManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS); childbirthManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index dc56ea4..e0c63ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -682,7 +682,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { initQueryMap.put("hivkt", "艾滋病检测结果"); initQueryMap.put("syjg", "梅毒检测结果"); initQueryMap.put("ygbmky", "乙肝检测结果"); - initQueryMap.put("qqybuild", "建档孕周"); + initQueryMap.put("createdWeek", "建档孕周"); initQueryMap.put("coupon", "优惠券发放"); @@ -839,7 +839,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { areaQueryMap.put("hivkt", "艾滋病检测结果"); areaQueryMap.put("syjg", "梅毒检测结果"); areaQueryMap.put("ygbmky", "乙肝检测结果"); - areaQueryMap.put("qqybuild", "建档孕周"); + areaQueryMap.put("createdWeek", "建档孕周"); areaQueryMap.put("coupon", "优惠券发放"); Map initQueryMapqhdky = new LinkedHashMap<>(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java index a6b5666..4501e68 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java @@ -76,6 +76,7 @@ public class ChildbirthManagerQueryModel { */ private String buildWeek; private String qqybuild; + private String createdWeek; /** * @auther HuJiaqi @@ -484,6 +485,14 @@ public class ChildbirthManagerQueryModel { // 是否发放过优惠券 private String coupon; + public String getCreatedWeek() { + return createdWeek; + } + + public void setCreatedWeek(String createdWeek) { + this.createdWeek = createdWeek; + } + public String getCoupon() { return coupon; }