From 6ec67852cbcbfb796fc68c27ecf6175f7254b632 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Mon, 24 Jun 2024 10:19:34 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E6=8C=82=E5=8F=B7=E5=88=97=E8=A1=A8=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/dao/master/AppointmentMapper.java | 2 +- .../permission/service/AppointmentService.java | 2 +- .../service/impl/AppointmentServiceImpl.java | 11 +++-- .../resources/mainOrm/master/AppointmentMapper.xml | 12 ++++- .../com/lyms/platform/pojo/AppointmentModel.java | 14 ++++++ .../web/controller/PatientDtController.java | 53 ++++++++++++++++++++-- 6 files changed, 84 insertions(+), 10 deletions(-) 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 fda43e7..dccf3a6 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 @@ -7,5 +7,5 @@ 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); + List queryAppointment(@Param("doctor") String doctor, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("name")String name,@Param("dept")String 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 4454b80..1026739 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 @@ -5,6 +5,6 @@ import com.lyms.platform.pojo.AppointmentModel; import java.util.List; public interface AppointmentService { - List queryAppointment(String doctor, String startTime, String endTime,String name); + List queryAppointment(String doctor, String startTime, String endTime,String name,String doctorName); } 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 25acd49..6ca07c2 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 @@ -6,14 +6,19 @@ import com.lyms.platform.pojo.AppointmentModel; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @Service("appointmentService") public class AppointmentServiceImpl implements AppointmentService { @Autowired private AppointmentMapper appointmentMapper; + @Override - public List queryAppointment(String doctor, String startTime, String endTime,String name) { - return appointmentMapper.queryAppointment(doctor,startTime,endTime,name); + public List queryAppointment(String doctor, String startTime, String endTime,String name,String doctorName) { + String dept=null; + if ("孙慧洁".equals(doctor)){ + dept="产科门诊"; + doctor=doctorName; + } + return appointmentMapper.queryAppointment(doctor,startTime,endTime,name,dept); } } 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 6525b9b..e5c1aaf 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml @@ -20,11 +20,19 @@ diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java index de67618..e71ed8a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java @@ -2,6 +2,8 @@ package com.lyms.platform.pojo; +import org.springframework.data.annotation.Transient; + import java.util.Date; public class AppointmentModel { @@ -17,6 +19,9 @@ public class AppointmentModel { private Date checkTime; private String doctor; private String dept; + //是否建档 1为是 0为否 + @Transient + private Integer isBuild; private Date created; public Integer getId() { @@ -115,6 +120,14 @@ public class AppointmentModel { this.created = created; } + public Integer getIsBuild() { + return isBuild; + } + + public void setIsBuild(Integer isBuild) { + this.isBuild = isBuild; + } + @Override public String toString() { return "AppointmentModel{" + @@ -129,6 +142,7 @@ public class AppointmentModel { ", checkTime=" + checkTime + ", doctor='" + doctor + '\'' + ", dept='" + dept + '\'' + + ", isBuild=" + isBuild + ", created=" + created + '}'; } 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 0e9bf34..2e6a5bc 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 @@ -487,13 +487,23 @@ public class PatientDtController { return antenatalExaminationFacade.addPatientNipt(patientNiptDTO,userId); } + /** + * 预约挂号列表查询 + * @param authorization + * @param doctor + * @param startTime + * @param endTime + * @param name + * @return + */ @RequestMapping(method = RequestMethod.GET, value = "/dt/appointment") @ResponseBody public BaseResponse getAppointment(@RequestHeader("Authorization")String authorization, @RequestParam(required = true) String doctor, @RequestParam(required = true) String startTime, @RequestParam(required = true) String endTime, - @RequestParam(required = false) String name + @RequestParam(required = false) String name, + @RequestParam(required = false) String doctorName ) { if (!Authorization.equals(authorization)){ @@ -502,10 +512,47 @@ public class PatientDtController { BaseResponse baseResponse=new BaseResponse(); startTime=startTime+" 00:00:00"; endTime=endTime+" 23:59:59"; - baseResponse.setObject(appointmentService.queryAppointment(doctor,startTime,endTime,name)); + List modelList= appointmentService.queryAppointment(doctor,startTime,endTime,name,doctorName); + + if (CollectionUtils.isNotEmpty(modelList)){ + PatientsQuery patientsQuery =new PatientsQuery(); + patientsQuery.setYn(1); + patientsQuery.setHospitalId(hospitalId); + for (int i = 0,j=modelList.size(); i < j; i++) { + AppointmentModel appointmentModel= modelList.get(i); + 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 { + return baseResponse.setErrormsg("参数异常").setErrorcode(-1); + } + } + List patientsList= patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patientsList)){ + appointmentModel.setIsBuild(1); + }else { + appointmentModel.setIsBuild(0); + } + } + } + baseResponse.setObject(modelList); baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); return baseResponse; } + + /** + * 挂号信息同步 + * @param authorization + * @param doctor + * @param date + * @return + */ @RequestMapping(method = RequestMethod.GET, value = "/dt/sync/appointment") @ResponseBody public BaseResponse syncAppointmentList(@RequestHeader("Authorization")String authorization, @@ -518,7 +565,7 @@ public class PatientDtController { params.put("doctor",doctor); params.put("ksrq",date+" 00:00:00"); params.put("jsrq",date+" 23:59:59"); - String str= HttpClientUtil.doGet("/dtdyrm/getdtAppointment" ,params,"utf-8",null); + String str= HttpClientUtil.doGet("http://192.168.5.23:9090/dtdyrm/getdtAppointment" ,params,"utf-8",null); System.out.println(str); return new BaseResponse(); } -- 1.8.3.1