From aff627aa56cddf8389bf44695b8ad85f1a3bcdc2 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Thu, 4 Jul 2024 09:47:31 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=90=8E?= =?UTF-8?q?=E6=A8=A1=E7=89=88=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/PatientServiceController.java | 7 ++++--- .../operate/web/controller/PostpartumReportController.java | 12 ++++++++++++ .../platform/operate/web/facade/PostpartumReportFacade.java | 12 ++++++++++++ 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java index 6aff8d7..31fcb76 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java @@ -220,7 +220,8 @@ public class PatientServiceController extends BaseController { ps.setId(patientService.getId()); ps.setParentid(patientService.getParentid()); ps.setSerStatus(1); - ps.setServiceWeek(yxzhVO.getWeeks()); + //如果是产后默认84 + ps.setServiceWeek(84); ps.setSerType(20); baseResponse = patientServiceFacade.updatePatientService(ps,Integer.valueOf(bookbuildingDoctor)); } @@ -252,11 +253,11 @@ public class PatientServiceController extends BaseController { list.add(m2); list.add(m3); }else if (patients.getType()==3){ - //开通产后康复服务 + //开通产后康复服务 默认84 ps.setPerType(3); Map m3 = new HashMap<>(); m3.put("serType","20"); - m3.put("serviceWeek",yxzhVO.getWeeks()+""); + m3.put("serviceWeek","84"); list.add(m3); } ps.setSerInfos(list); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java index 6c97044..4dd3f53 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumReportController.java @@ -143,6 +143,18 @@ public class PostpartumReportController extends BaseController { postpartumReportQuery.setLimit(limit); return postpartumReportFacade.queryModelList(postpartumReportQuery,getUserId(request)); } + + @RequestMapping(method = RequestMethod.GET, value = "/model/getListType") + @ResponseBody + @TokenRequired + public BaseResponse getPostpartumReportModelListType(Integer deliveryModel, Integer num, + HttpServletRequest request) { + PostpartumReportQuery postpartumReportQuery=new PostpartumReportQuery(); + postpartumReportQuery.setDeliveryModel(deliveryModel); + postpartumReportQuery.setNum(num); + return postpartumReportFacade.queryModelByType(postpartumReportQuery,getUserId(request)); + } + /** * 新增字典模版 * @param postpartumReport diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumReportFacade.java index 8d700ac..210a265 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumReportFacade.java @@ -98,4 +98,16 @@ public class PostpartumReportFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + public BaseResponse queryModelByType(PostpartumReportQuery postpartumReportQuery, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + postpartumReportQuery.setHospitalId(hospitalId); + postpartumReportQuery.setYn(1); + List mapList= postpartumReportModelService.queryList(postpartumReportQuery); + BaseResponse objectResponse = new BaseResponse(); + objectResponse.setObject(mapList); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } -- 1.8.3.1