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 index 5501bf9..9c635a5 100644 --- 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 @@ -8,6 +8,15 @@ public class AppointmentQuery extends BaseQuery { private String endTime; private String name; private String dept; + private String idCard; + + public String getIdCard() { + return idCard; + } + + public void setIdCard(String idCard) { + this.idCard = idCard; + } public String getDoctor() { return doctor; 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 5ebc13e..dcbb661 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 @@ -8,5 +8,5 @@ import java.util.List; public interface AppointmentService { List queryAppointment(AppointmentQuery appointmentQuery); - + int queryAppointmentCount(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 19368c7..fb996fc 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 @@ -28,4 +28,9 @@ public class AppointmentServiceImpl implements AppointmentService { } return appointmentMapper.queryAppointment(appointmentQuery); } + + @Override + public int queryAppointmentCount(AppointmentQuery appointmentQuery) { + return appointmentMapper.queryAppointmentCount(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 8cb7e76..727a677 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml @@ -30,7 +30,9 @@ and doctor=#{doctor} - + + and idCard=#{idCard} + and (name like concat('%',#{name},'%') or pinyin like concat('%',#{name},'%')) @@ -49,7 +51,9 @@ and doctor=#{doctor} - + + and idCard=#{idCard} + and (name like concat('%',#{name},'%') or pinyin like concat('%',#{name},'%')) 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 13e6889..286e05e 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 @@ -33,6 +33,16 @@ public class AppointmentModel { private Date created; @Transient private List rlevel;//高危风险颜色 + @Transient + private Integer appointmentNum;//未建档用户就诊次数 + + public Integer getAppointmentNum() { + return appointmentNum; + } + + public void setAppointmentNum(Integer appointmentNum) { + this.appointmentNum = appointmentNum; + } public List getrlevel() { return rlevel; 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 4c419c1..5fcfc16 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 @@ -597,6 +597,7 @@ public class DtdyrmFmService implements IdtdyrmFmService { Map cnames = new LinkedHashMap<>(); cnames.put("建档状态", "建档状态"); cnames.put("就诊卡号", "就诊卡号"); + cnames.put("就诊次数", "就诊次数"); cnames.put("姓名", "姓名"); cnames.put("服务截止时间", "服务截止时间"); cnames.put("手机号", "手机号"); @@ -636,6 +637,9 @@ public class DtdyrmFmService implements IdtdyrmFmService { patientsQuery.setPhone(phone); }else { appointmentModel.setIsBuild(0); + appointmentQuery.setIdCard(idCard); + appointmentModel.setAppointmentNum(appointmentService.queryAppointmentCount(appointmentQuery)); + } } if (appointmentModel.getIsBuild()==null){ @@ -655,10 +659,15 @@ public class DtdyrmFmService implements IdtdyrmFmService { } }else { appointmentModel.setIsBuild(0); + if (appointmentModel.getAppointmentNum()==null || appointmentModel.getAppointmentNum()==0){ + appointmentQuery.setIdCard(idCard); + appointmentModel.setAppointmentNum(appointmentService.queryAppointmentCount(appointmentQuery)); + } } } result.put("建档状态",appointmentModel.getIsBuild()==1?"已建档":"未建档"); result.put("就诊卡号", appointmentModel.getVccardNo()); + result.put("就诊次数",appointmentModel.getAppointmentNum()); result.put("姓名", appointmentModel.getName()); result.put("手机号", appointmentModel.getPhone()); result.put("证件号", appointmentModel.getIdCard()); 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 e6b58d3..206f4d5 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 @@ -694,6 +694,8 @@ public class PatientDtController extends BaseController { }else { appointmentModel.setIsBuild(0); appointmentModel.setExpire(1); + appointmentQuery.setIdCard(idCard); + appointmentModel.setAppointmentNum(appointmentService.queryAppointmentCount(appointmentQuery)); } } if (appointmentModel.getIsBuild()==null){ @@ -740,6 +742,10 @@ public class PatientDtController extends BaseController { }else { appointmentModel.setIsBuild(0); appointmentModel.setExpire(1); + if (appointmentModel.getAppointmentNum()==null || appointmentModel.getAppointmentNum()==0){ + appointmentQuery.setIdCard(idCard); + appointmentModel.setAppointmentNum(appointmentService.queryAppointmentCount(appointmentQuery)); + } } } if (isBuild!=null){