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 753fb87..4b31529 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 @@ -312,7 +312,7 @@ public class MatDeliverController extends BaseController{ map.put("num",num); map.put("dueDate",queryModel.getDueDate()); map.put("fmTime",queryModel.getFmTime()); - map.put("zyNo","-"); + map.put("zyNo",queryModel.getBhnum()); map.put("name",queryModel.getName()); map.put("age", queryModel.getAge()); //居住地 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java index c3c3c68..4cbe94c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumRecordsFacade.java @@ -208,8 +208,6 @@ public class PostpartumRecordsFacade { }else{ return new BaseObjectResponse().setErrormsg("请输入查询条件!").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); } - - return new BaseObjectResponse().setErrormsg("成功!").setErrorcode(ErrorCodeConstants.SUCCESS).setData(postpartumRecordsResult); } 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 f79b1a5..f3a5829 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 @@ -423,6 +423,15 @@ public class ChildbirthManagerQueryModel { private String dlfm;//导乐分娩(0:未选择;1:已选择) private String fmzty;//分娩镇痛仪(0:未选择;1:已选择) private String zypbfm;//专业陪伴分娩(0:未选择;1:已选择) + private String bhnum;//住院号 + + public String getBhnum() { + return bhnum; + } + + public void setBhnum(String bhnum) { + this.bhnum = bhnum; + } public String getZgnmz() { return zgnmz; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java index b62941c..28e3866 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java @@ -500,6 +500,7 @@ public class MaterDeliverWorker implements Callable