diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index a5ae2ff..df03a95 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -122,7 +122,7 @@ public class PatientsService { patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query)); query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit()); } - //System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); + // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString()); return iPatientDao.queryPatient(query.addOrder(Sort.Direction.DESC, field)); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java index dccf3a6..79403f8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java @@ -1,11 +1,11 @@ package com.lyms.platform.permission.dao.master; +import com.lyms.platform.permission.model.AppointmentQuery; import com.lyms.platform.pojo.AppointmentModel; -import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; public interface AppointmentMapper { - List queryAppointment(@Param("doctor") String doctor, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("name")String name,@Param("dept")String dept); + List queryAppointment(AppointmentQuery appointmentQuery); + int queryAppointmentCount(AppointmentQuery appointmentQuery); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AppointmentQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AppointmentQuery.java new file mode 100644 index 0000000..5501bf9 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/AppointmentQuery.java @@ -0,0 +1,51 @@ +package com.lyms.platform.permission.model; + +import com.lyms.platform.common.dao.BaseQuery; + +public class AppointmentQuery extends BaseQuery { + private String doctor; + private String startTime; + private String endTime; + private String name; + private String dept; + + public String getDoctor() { + return doctor; + } + + public void setDoctor(String doctor) { + this.doctor = doctor; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDept() { + return dept; + } + + public void setDept(String dept) { + this.dept = dept; + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java index 1026739..5ebc13e 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java @@ -1,10 +1,12 @@ package com.lyms.platform.permission.service; +import com.lyms.platform.permission.model.AppointmentQuery; import com.lyms.platform.pojo.AppointmentModel; +import javax.servlet.http.HttpServletResponse; import java.util.List; public interface AppointmentService { - List queryAppointment(String doctor, String startTime, String endTime,String name,String doctorName); + List queryAppointment(AppointmentQuery appointmentQuery); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java index cab4398..19368c7 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java @@ -1,25 +1,31 @@ package com.lyms.platform.permission.service.impl; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.permission.dao.master.AppointmentMapper; +import com.lyms.platform.permission.model.AppointmentQuery; import com.lyms.platform.permission.service.AppointmentService; import com.lyms.platform.pojo.AppointmentModel; +import com.lyms.platform.pojo.DtFm; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; + @Service("appointmentService") public class AppointmentServiceImpl implements AppointmentService { @Autowired private AppointmentMapper appointmentMapper; @Override - public List queryAppointment(String doctor, String startTime, String endTime,String name,String doctorName) { - String dept=null; - if ("孙慧洁".equals(doctor)){ - dept="产科"; - doctor=doctorName; + public List queryAppointment(AppointmentQuery appointmentQuery) { + if (StringUtils.isNotEmpty(appointmentQuery.getNeed())){ + appointmentQuery.mysqlBuild( appointmentMapper.queryAppointmentCount(appointmentQuery)); } - return appointmentMapper.queryAppointment(doctor,startTime,endTime,name,dept); + return appointmentMapper.queryAppointment(appointmentQuery); } } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml index 9b5fa39..8cb7e76 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml @@ -17,9 +17,13 @@ + + + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + - - select * from appointment where 1=1 @@ -35,5 +39,24 @@ and =#{startTime}]]> and + + + + diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java index 8bbfc47..4c419c1 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java @@ -9,6 +9,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.MatDeliverFacade; @@ -16,15 +17,12 @@ import com.lyms.platform.operate.web.request.DtFmRequest; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.operate.web.result.FmResult; import com.lyms.platform.operate.web.utils.ResponseUtil; -import com.lyms.platform.permission.model.DtFmQuery; -import com.lyms.platform.permission.model.Users; -import com.lyms.platform.permission.model.UsersQuery; +import com.lyms.platform.permission.model.*; +import com.lyms.platform.permission.service.AppointmentService; import com.lyms.platform.permission.service.DeliveryService; +import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.DtFm; -import com.lyms.platform.pojo.MaternalDeliverModel; -import com.lyms.platform.pojo.Patients; -import com.lyms.platform.pojo.PersonModel; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; @@ -589,4 +587,90 @@ public class DtdyrmFmService implements IdtdyrmFmService { } } + + @Autowired + private AppointmentService appointmentService; + @Autowired + private PatientServiceService patientServiceService; + @Override + public void reportAppointmentList(HttpServletResponse response, String doctor, String startTime, String endTime, String name, String doctorName) { + Map cnames = new LinkedHashMap<>(); + cnames.put("建档状态", "建档状态"); + cnames.put("就诊卡号", "就诊卡号"); + cnames.put("姓名", "姓名"); + cnames.put("服务截止时间", "服务截止时间"); + cnames.put("手机号", "手机号"); + cnames.put("证件号", "证件号"); + cnames.put("出生日期", "出生日期"); + cnames.put("就诊时间", "就诊时间"); + cnames.put("就诊医生", "就诊医生"); + cnames.put("科室", "科室"); + cnames.put("预约时间", "预约时间"); + String dept=null; + if ("孙慧洁".equals(doctor)){ + dept="产科"; + doctor=doctorName; + } + AppointmentQuery appointmentQuery=new AppointmentQuery(); + appointmentQuery.setDoctor(doctor); + appointmentQuery.setStartTime(startTime); + appointmentQuery.setEndTime(endTime); + appointmentQuery.setDept(dept); + appointmentQuery.setName(name); + List list= appointmentService.queryAppointment(appointmentQuery); + List> results = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(list)) { + PatientsQuery patientsQuery =new PatientsQuery(); + patientsQuery.setYn(1); + patientsQuery.setHospitalId("2100002419"); + for (AppointmentModel appointmentModel : list) { + Map result = new LinkedHashMap<>(); + String idCard=appointmentModel.getIdCard(); + String phone=appointmentModel.getPhone(); + String username=appointmentModel.getName(); + if (StringUtils.isNotEmpty(idCard)){ + patientsQuery.setCardNo(idCard); + }else { + if (StringUtils.isNotEmpty(username)&&StringUtils.isNotEmpty(phone)){ + patientsQuery.setName(username); + patientsQuery.setPhone(phone); + }else { + appointmentModel.setIsBuild(0); + } + } + if (appointmentModel.getIsBuild()==null){ + List patientsList= patientsService.queryPatient(patientsQuery); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patientsList)){ + appointmentModel.setIsBuild(1); + Patients patients= patientsList.get(0); + PatientServiceQuery patientQuery = new PatientServiceQuery(); + patientQuery.setParentid(patients.getId()); + patientQuery.setSerType(1); + + List patientServices = patientServiceService.queryPatientService(patientQuery); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patientServices)){ + Date serEndTime= patientServices.get(0).getSerEndTime(); + appointmentModel.setSerEndTime(serEndTime); + result.put("服务截止时间", DateUtil.gety_m_dhm(appointmentModel.getSerEndTime())); + } + }else { + appointmentModel.setIsBuild(0); + } + } + result.put("建档状态",appointmentModel.getIsBuild()==1?"已建档":"未建档"); + result.put("就诊卡号", appointmentModel.getVccardNo()); + result.put("姓名", appointmentModel.getName()); + result.put("手机号", appointmentModel.getPhone()); + result.put("证件号", appointmentModel.getIdCard()); + result.put("出生日期",appointmentModel.getAge()); + result.put("就诊时间",DateUtil.gety_m_dhm(appointmentModel.getCheckTime())); + result.put("就诊医生",appointmentModel.getDoctor()); + result.put("科室", appointmentModel.getDept()); + result.put("预约时间",DateUtil.gety_m_dhm(appointmentModel.getCreated())); + results.add(result); + } + } + + ResponseUtil.responseExcel(cnames, results, response); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/IdtdyrmFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/IdtdyrmFmService.java index cf87f25..5810ed6 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/IdtdyrmFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/IdtdyrmFmService.java @@ -14,4 +14,5 @@ public interface IdtdyrmFmService { BaseResponse getFmRecordList(DtFmQuery dtFmQuery, Integer userId); void saveFm(DtFm dtFm); void reportFmRecord(HttpServletResponse response,DtFmQuery dtFmQuery,Integer userId); + void reportAppointmentList(HttpServletResponse response,String doctor, String startTime, String endTime,String name,String doctorName); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java index 6627417..ae03e93 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java @@ -1,6 +1,9 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.hospitalapi.dtdyrm.IdtdyrmFmService; import com.lyms.platform.biz.service.*; +import com.lyms.platform.common.annotation.TokenRequired; +import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.result.BaseObjectResponse; @@ -13,9 +16,12 @@ import com.lyms.platform.operate.web.request.AntExQueryRequest; import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; import com.lyms.platform.operate.web.request.PatientQueryRequest; import com.lyms.platform.operate.web.result.HighScoreResult; +import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.operate.web.vo.PatientNiptDTO; +import com.lyms.platform.permission.model.AppointmentQuery; +import com.lyms.platform.permission.model.DtFmQuery; import com.lyms.platform.permission.model.PatientService; import com.lyms.platform.permission.model.PatientServiceQuery; import com.lyms.platform.permission.service.AppointmentService; @@ -28,6 +34,7 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.*; @@ -37,10 +44,12 @@ import java.util.*; */ @Controller @RequestMapping -public class PatientDtController { +public class PatientDtController extends BaseController { @Autowired private PatientsService patientsService; @Autowired + private PatientWeightService patientWeightService1; + @Autowired private PatientWeightService2 patientWeightService; @Autowired private BloodPressureService bloodPressureService; @@ -422,6 +431,120 @@ public class PatientDtController { } /** + * 获取体重列表； + * @param authorization + * @param id + * @return + */ + @ResponseBody + @RequestMapping(value = "/dt/patient/weight/info/{id}", method = RequestMethod.GET) + public BaseResponse info(@RequestHeader("Authorization")String authorization,@PathVariable String id) { + if (!authorization.contains(Authorization)){ + return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); + } + return patientWeightService1.info(id); + } + + /** + * 添加体重管理 + * @param patientWeight + * @return + */ + @ResponseBody + @RequestMapping(value = "/dt/patient/weight",method = RequestMethod.POST) + public BaseResponse addOrUpdate(@RequestHeader("Authorization")String authorization,PatientWeight patientWeight) { + if (!authorization.contains(Authorization)){ + return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); + } + return patientWeightService1.addOrUpdate(userId, patientWeight); + } + @Autowired + private PregnancyReportFacade pregnancyReportFacade; + + /** + * 获取患者体重报告 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/dt/getPatientReport") + @ResponseBody + public BaseResponse getPatientReport(@RequestParam(required = false) String name, + @RequestParam(required = false) Integer week, + @RequestParam(required = false) Integer weightType, + @RequestHeader("Authorization")String authorization){ + if (!authorization.contains(Authorization)){ + return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); + } + PregnancyReportQuery pregnancyReportQuery=new PregnancyReportQuery(); + pregnancyReportQuery.setWeek(week); + pregnancyReportQuery.setWeightType(weightType); + pregnancyReportQuery.setName(name); + return pregnancyReportFacade.getPatientReport(pregnancyReportQuery,userId); + } + @Autowired + private PregnancyReportMattersServiceFacade pregnancyReportMattersServiceFacade; + /** + * 获取模版列表 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/dt/matters/getList") + @ResponseBody + public BaseResponse getMattersList( + @RequestHeader("Authorization")String authorization, + @RequestParam(required = false) Integer week, + @RequestParam(required = false) Integer riskType, + @RequestParam Integer type, + @RequestParam(required = false) String name, + @RequestParam("page") Integer page, + @RequestParam("limit") Integer limit + ){ + if (!authorization.contains(Authorization)){ + return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); + } + PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery(); + postpartumReportQuery.setWeek(week); + postpartumReportQuery.setType(type); + postpartumReportQuery.setRiskType(riskType); + postpartumReportQuery.setPage(page); + postpartumReportQuery.setLimit(limit); + postpartumReportQuery.setName(name); + return pregnancyReportMattersServiceFacade.getList(postpartumReportQuery,userId); + } + + /** + * 获取高危饮食原则模版详情 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/dt/matters/getRisk") + @ResponseBody + public BaseResponse getReportByRisk( @RequestHeader("Authorization")String authorization,@RequestParam Integer week,@RequestParam Integer type, + @RequestParam String riskFactorId){ + if (!authorization.contains(Authorization)){ + return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); + } + BaseResponse baseResponse= new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + PregnancyReportMattersQuery postpartumReportQuery=new PregnancyReportMattersQuery(); + postpartumReportQuery.setWeek(week); + postpartumReportQuery.setType(type); + postpartumReportQuery.setRiskFactorId(StringUtils.covertToList(riskFactorId, String.class)); + baseResponse.setObject(pregnancyReportMattersServiceFacade.getReportByRisk(postpartumReportQuery,userId)); + return baseResponse; + } + /** + * 获取模版详情 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/dt/matters/getInfo") + @ResponseBody + public BaseResponse getMattersList( @RequestHeader("Authorization")String authorization,String id){ + if (!authorization.contains(Authorization)){ + return new BaseResponse().setErrorcode(-1).setErrormsg("权限异常"); + } + BaseResponse baseResponse= new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + baseResponse.setObject(pregnancyReportMattersServiceFacade.getPregnancyReport(id)); + return baseResponse; + } + + /** * 查询初诊接口 * * @param id @@ -494,6 +617,8 @@ public class PatientDtController { } return antenatalExaminationFacade.addPatientNipt(patientNiptDTO,userId); } + //大同需要特殊处理的护士名称 + private static final String doctors="孙慧洁,曹琴,温燕芳,牛冬燕,王改然,杜文瑞,习亚美,卫娜,施春花,胡雪娇"; /** * 预约挂号列表查询 @@ -513,7 +638,9 @@ public class PatientDtController { @RequestParam(required = false) Integer isBuild, @RequestParam(required = false) Integer expire, @RequestParam(required = false) String name, - @RequestParam(required = false) String doctorName + @RequestParam(required = false) String doctorName, + @RequestParam(required = false) Integer page, + @RequestParam(required = false) Integer limit ) { if (!authorization.contains(Authorization)){ @@ -522,9 +649,28 @@ public class PatientDtController { BaseResponse baseResponse=new BaseResponse(); startTime=startTime+" 00:00:00"; endTime=endTime+" 23:59:59"; - List modelList= appointmentService.queryAppointment(doctor,startTime,endTime,name,doctorName); + String dept=null; + String need=null; + if (doctors.contains(doctor)){ + doctor=doctorName; + dept="产科"; + if (isBuild==null && expire==null){ + need="true"; + } + } + AppointmentQuery appointmentQuery=new AppointmentQuery(); + appointmentQuery.setDoctor(doctor); + appointmentQuery.setStartTime(startTime); + appointmentQuery.setEndTime(endTime); + appointmentQuery.setDept(dept); + appointmentQuery.setName(name); + appointmentQuery.setNeed(need); + appointmentQuery.setLimit(limit); + appointmentQuery.setPage(page); + List modelList= appointmentService.queryAppointment(appointmentQuery); Date date=new Date(); if (CollectionUtils.isNotEmpty(modelList)){ + Map params=new HashMap(); boolean b=true; if (expire!=null || isBuild!=null){ b=false; @@ -614,11 +760,16 @@ public class PatientDtController { } } } + if (b){ - baseResponse.setObject(modelList); + params.put("data",modelList); }else { - baseResponse.setObject(checkList); + params.put("data",checkList); } + if (StringUtils.isNotEmpty(need)){ + params.put("pageInfo",appointmentQuery.getPageInfo()); + } + baseResponse.setObject(params); } baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); return baseResponse; @@ -640,13 +791,33 @@ public class PatientDtController { return new BaseObjectResponse().setErrorcode(-1).setErrormsg("权限异常"); } Map params=new HashMap<>(); + if (doctors.contains(doctor)){ + doctor="孙慧洁"; + } params.put("doctor",doctor); params.put("ksrq",date); params.put("jsrq",date); HttpClientUtil.doGet("http://192.168.5.23:9090/dtdyrm/getdtAppointment" ,params,"utf-8",null); - //System.out.println(str); return new BaseResponse(); } + @Autowired + private IdtdyrmFmService idtdyrmFmService; + //导出 + @ResponseBody + @RequestMapping(value = "/dt/appointment/export", method = RequestMethod.GET) + public void reportFmRecord(@RequestHeader("Authorization")String authorization, + @RequestParam String doctor, + @RequestParam String startTime, + @RequestParam String endTime, + @RequestParam(required = false) String name, + @RequestParam(required = false) String doctorName, + HttpServletResponse response) { + if (!authorization.contains(Authorization)){ + throw new RuntimeException("权限异常"); + } + idtdyrmFmService.reportAppointmentList(response,doctor,startTime,endTime,name,doctorName); + } + @RequestMapping(method = RequestMethod.GET, value = "/pc/pregnancy") @@ -671,7 +842,6 @@ public class PatientDtController { params.put("type",type); str= HttpClientUtil.doGet(MEMBER_BABY_URL+"/wx/pc/articles/precise" ,params,"utf-8",null); } - //System.out.println(str); return str; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 5726deb..3028fb6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1484,7 +1484,11 @@ public class BookbuildingFacade { String date = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), 1)); String startTime = date + " 00:00:00"; String endTime = date + " 23:59:59"; - List modelList = appointmentService.queryAppointment("孙慧洁", startTime, endTime, null, null); + AppointmentQuery appointmentQuery=new AppointmentQuery(); + appointmentQuery.setStartTime(startTime); + appointmentQuery.setEndTime(endTime); + appointmentQuery.setDept("产科"); + List modelList = appointmentService.queryAppointment(appointmentQuery); if (CollectionUtils.isNotEmpty(modelList)) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(1);