From 402a38d4ed34f39a665f7584703b62c337c1f8f3 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Sun, 23 Jun 2024 15:18:14 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E5=A4=A7=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91=E3=80=81?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=8C=82=E5=8F=B7=E9=A1=B5=E9=9D=A2=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E7=AD=89=E9=80=BB=E8=BE=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/dal/IPostpartumReportDao.java | 19 +++ .../lyms/platform/biz/dal/IPregnancyReportDao.java | 16 +++ .../biz/dal/IPregnancyReportMattersDao.java | 14 ++ .../dal/impl/IPregnancyReportMattersDaoImpl.java | 44 ++++++ .../biz/dal/impl/PostpartumReportDaoImpl.java | 49 +++++++ .../biz/dal/impl/PregnancyReportDaoImpl.java | 43 ++++++ .../biz/service/PostpartumReportService.java | 72 ++++++++++ .../biz/service/PregnancyReportMattersService.java | 41 ++++++ .../biz/service/PregnancyReportService.java | 40 ++++++ .../permission/dao/master/AppointmentMapper.java | 11 ++ .../permission/service/AppointmentService.java | 10 ++ .../service/impl/AppointmentServiceImpl.java | 19 +++ .../permission/service/impl/LisServiceImpl.java | 2 +- .../resources/mainOrm/master/AppointmentMapper.xml | 30 +++++ .../lyms/platform/common/utils/HttpClientUtil.java | 2 +- .../java/com/lyms/platform/beans/SerialIdEnum.java | 3 +- .../com/lyms/platform/pojo/AppointmentModel.java | 135 +++++++++++++++++++ .../com/lyms/platform/pojo/PostpartumReport.java | 147 +++++++++++++++++++++ .../com/lyms/platform/pojo/PregnancyReport.java | 144 ++++++++++++++++++++ .../lyms/platform/pojo/PregnancyReportMatters.java | 81 ++++++++++++ .../lyms/platform/query/PostpartumReportQuery.java | 78 +++++++++++ .../query/PregnancyReportMattersQuery.java | 67 ++++++++++ .../lyms/platform/query/PregnancyReportQuery.java | 102 ++++++++++++++ 23 files changed, 1166 insertions(+), 3 deletions(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPostpartumReportDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPregnancyReportDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPregnancyReportMattersDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/IPregnancyReportMattersDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PostpartumReportDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PregnancyReportDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostpartumReportService.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PregnancyReportMattersService.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PregnancyReportService.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java create mode 100644 platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumReport.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReport.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReportMatters.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportMattersQuery.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportQuery.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPostpartumReportDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPostpartumReportDao.java new file mode 100644 index 0000000..7ffcac2 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPostpartumReportDao.java @@ -0,0 +1,19 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.dao.operator.Page; +import com.lyms.platform.pojo.PostpartumReport; + +import java.util.List; + +public interface IPostpartumReportDao { + PostpartumReport add(PostpartumReport postpartumReport); + void updateById(PostpartumReport postpartumReport,String id); + public PostpartumReport getPatient(String id); + + public int queryPatientCount(MongoQuery query); + + public List queryPatient(MongoQuery query); + + public Page findPage(MongoQuery query); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPregnancyReportDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPregnancyReportDao.java new file mode 100644 index 0000000..2ea38f1 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPregnancyReportDao.java @@ -0,0 +1,16 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.PregnancyReport; + +import java.util.List; + +public interface IPregnancyReportDao { + PregnancyReport add(PregnancyReport pregnancyReport); + void updateById(PregnancyReport pregnancyReport,String id); + public PregnancyReport getPatient(String id); + + public int queryPatientCount(MongoQuery query); + + public List queryPatient(MongoQuery query); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPregnancyReportMattersDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPregnancyReportMattersDao.java new file mode 100644 index 0000000..d092e34 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPregnancyReportMattersDao.java @@ -0,0 +1,14 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.PregnancyReportMatters; + +import java.util.List; + +public interface IPregnancyReportMattersDao { + PregnancyReportMatters add(PregnancyReportMatters pregnancyReport); + void updateById(PregnancyReportMatters pregnancyReport,String id); + public PregnancyReportMatters getPatient(String id); + public int queryPatientCount(MongoQuery query); + public List queryMatters(MongoQuery query); +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/IPregnancyReportMattersDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/IPregnancyReportMattersDaoImpl.java new file mode 100644 index 0000000..c623664 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/IPregnancyReportMattersDaoImpl.java @@ -0,0 +1,44 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.IPregnancyReportDao; +import com.lyms.platform.biz.dal.IPregnancyReportMattersDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.PregnancyReport; +import com.lyms.platform.pojo.PregnancyReportMatters; +import org.springframework.stereotype.Repository; + +import java.util.Date; +import java.util.List; + +@Repository("pregnancyReportMattersDao") +public class IPregnancyReportMattersDaoImpl extends BaseMongoDAOImpl implements IPregnancyReportMattersDao { + @Override + public PregnancyReportMatters add(PregnancyReportMatters pregnancyReport) { + pregnancyReport.setYn(1); + pregnancyReport.setCreated(new Date()); + return save(pregnancyReport); + } + + @Override + public void updateById(PregnancyReportMatters pregnancyReport, String id) { + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), pregnancyReport); + } + + @Override + public PregnancyReportMatters getPatient(String id) { + return findById(id); + } + + @Override + public int queryPatientCount(MongoQuery query) { + return (int) count(query.convertToMongoQuery()); + } + + @Override + public List queryMatters(MongoQuery query) { + return find(query.convertToMongoQuery()); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PostpartumReportDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PostpartumReportDaoImpl.java new file mode 100644 index 0000000..3600953 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PostpartumReportDaoImpl.java @@ -0,0 +1,49 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.IPostpartumReportDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.dao.operator.Page; +import com.lyms.platform.pojo.PostpartumReport; +import org.springframework.stereotype.Repository; + +import java.util.Date; +import java.util.List; + +@Repository("postpartumReportDao") +public class PostpartumReportDaoImpl extends BaseMongoDAOImpl implements IPostpartumReportDao { + + @Override + public PostpartumReport add(PostpartumReport postpartumReport) { + postpartumReport.setCreated(new Date()); + return save(postpartumReport); + } + + @Override + public void updateById(PostpartumReport postpartumReport, String id) { + postpartumReport.setModified(new Date()); + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), postpartumReport); + } + + @Override + public PostpartumReport getPatient(String id) { + return findById(id); + } + + @Override + public int queryPatientCount(MongoQuery query) { + return (int) count(query.convertToMongoQuery()); + } + + @Override + public List queryPatient(MongoQuery query) { + return find(query.convertToMongoQuery()); + } + + @Override + public Page findPage(MongoQuery query) { + return findPage(query.convertToMongoQuery()); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PregnancyReportDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PregnancyReportDaoImpl.java new file mode 100644 index 0000000..93d1950 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PregnancyReportDaoImpl.java @@ -0,0 +1,43 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.IPregnancyReportDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.PregnancyReport; +import org.springframework.stereotype.Repository; + +import java.util.Date; +import java.util.List; + +@Repository("pregnancyReportDao") +public class PregnancyReportDaoImpl extends BaseMongoDAOImpl implements IPregnancyReportDao { + @Override + public PregnancyReport add(PregnancyReport pregnancyReport) { + pregnancyReport.setCreated(new Date()); + pregnancyReport.setYn(1); + return save(pregnancyReport); + } + + @Override + public void updateById(PregnancyReport pregnancyReport, String id) { + pregnancyReport.setModified(new Date()); + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), pregnancyReport); + } + + @Override + public PregnancyReport getPatient(String id) { + return findById(id); + } + + @Override + public int queryPatientCount(MongoQuery query) { + return (int) count(query.convertToMongoQuery()); + } + + @Override + public List queryPatient(MongoQuery query) { + return find(query.convertToMongoQuery()); + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostpartumReportService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostpartumReportService.java new file mode 100644 index 0000000..21cd12f --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PostpartumReportService.java @@ -0,0 +1,72 @@ +package com.lyms.platform.biz.service; + +import com.lyms.platform.biz.dal.IPostpartumReportDao; +import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.dao.operator.Page; +import com.lyms.platform.common.result.BaseListResponse; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.pojo.PostpartumReport; +import com.lyms.platform.query.PostpartumReportQuery; +import org.apache.commons.collections.ArrayStack; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.velocity.util.ArrayListWrapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service("postpartumReportService") +public class PostpartumReportService { + @Autowired + private IPostpartumReportDao postpartumReportDao; + + + public PostpartumReport add(PostpartumReport postpartumReport){ + postpartumReport.setYn(1); + return postpartumReportDao.add(postpartumReport); + } + + public void updateById(PostpartumReport postpartumReport,String id){ + postpartumReportDao.updateById(postpartumReport,id); + } + + public PostpartumReport getPatient(String id){ + return postpartumReportDao.getPatient(id); + } + + public BaseResponse queryPatient(PostpartumReportQuery postpartumReportQuery){ + MongoQuery query = postpartumReportQuery.convertToQuery(); + if (StringUtils.isNotEmpty(postpartumReportQuery.getNeed())) { + postpartumReportQuery.mysqlBuild(postpartumReportDao.queryPatientCount(postpartumReportQuery.convertToQuery())); + query.start(postpartumReportQuery.getOffset()).end(postpartumReportQuery.getLimit()); + } + List results= postpartumReportDao.queryPatient(query); + List> mapList=new ArrayList<>(); + if (CollectionUtils.isNotEmpty(results)){ + for (PostpartumReport postpartumReport: results){ + Map params=new HashMap<>(); + params.put("id",postpartumReport.getId()); + params.put("num",postpartumReport.getNum()); + params.put("riskFactorName",postpartumReport.getRiskFactorName()); + params.put("created",postpartumReport.getCreated()); + mapList.add(params); + } + } + BaseListResponse objectResponse = new BaseListResponse(); + objectResponse.setData(mapList); + objectResponse.setPageInfo(postpartumReportQuery.getPageInfo()); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } + + public Page findPage(MongoQuery query){ + return postpartumReportDao.findPage(query); + } + +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PregnancyReportMattersService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PregnancyReportMattersService.java new file mode 100644 index 0000000..b9eaa2b --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PregnancyReportMattersService.java @@ -0,0 +1,41 @@ +package com.lyms.platform.biz.service; + +import com.lyms.platform.biz.dal.IPregnancyReportMattersDao; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.PregnancyReport; +import com.lyms.platform.pojo.PregnancyReportMatters; +import com.lyms.platform.query.PregnancyReportMattersQuery; +import com.lyms.platform.query.PregnancyReportQuery; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("pregnancyReportMattersService") +public class PregnancyReportMattersService { + @Autowired + private IPregnancyReportMattersDao pregnancyReportMattersDao; + + public PregnancyReportMatters add(PregnancyReportMatters postpartumReport){ + return pregnancyReportMattersDao.add(postpartumReport); + } + + public void updateById(PregnancyReportMatters postpartumReport,String id){ + pregnancyReportMattersDao.updateById(postpartumReport,id); + } + + public PregnancyReportMatters getPregnancyReport(String id){ + return pregnancyReportMattersDao.getPatient(id); + } + + public List queryPregnancyReport(PregnancyReportMattersQuery postpartumReportQuery){ + MongoQuery query = postpartumReportQuery.convertToQuery(); + if (StringUtils.isNotEmpty(postpartumReportQuery.getNeed())) { + postpartumReportQuery.mysqlBuild(pregnancyReportMattersDao.queryPatientCount(postpartumReportQuery.convertToQuery())); + query.start(postpartumReportQuery.getOffset()).end(postpartumReportQuery.getLimit()); + } + List results= pregnancyReportMattersDao.queryMatters(query); + return results; + } +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PregnancyReportService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PregnancyReportService.java new file mode 100644 index 0000000..4d97a46 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PregnancyReportService.java @@ -0,0 +1,40 @@ +package com.lyms.platform.biz.service; + +import com.lyms.platform.biz.dal.IPregnancyReportDao; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.pojo.PregnancyReport; +import com.lyms.platform.query.PregnancyReportQuery; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("pregnancyReportService") +public class PregnancyReportService { + + @Autowired + private IPregnancyReportDao pregnancyReportDao; + + public PregnancyReport add(PregnancyReport postpartumReport){ + return pregnancyReportDao.add(postpartumReport); + } + + public void updateById(PregnancyReport postpartumReport,String id){ + pregnancyReportDao.updateById(postpartumReport,id); + } + + public PregnancyReport getPregnancyReport(String id){ + return pregnancyReportDao.getPatient(id); + } + + public List queryPregnancyReport(PregnancyReportQuery postpartumReportQuery){ + MongoQuery query = postpartumReportQuery.convertToQuery(); + if (StringUtils.isNotEmpty(postpartumReportQuery.getNeed())) { + postpartumReportQuery.mysqlBuild(pregnancyReportDao.queryPatientCount(postpartumReportQuery.convertToQuery())); + query.start(postpartumReportQuery.getOffset()).end(postpartumReportQuery.getLimit()); + } + List results= pregnancyReportDao.queryPatient(query); + return results; + } +} 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 new file mode 100644 index 0000000..fda43e7 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/AppointmentMapper.java @@ -0,0 +1,11 @@ +package com.lyms.platform.permission.dao.master; + +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); +} 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 new file mode 100644 index 0000000..4454b80 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/AppointmentService.java @@ -0,0 +1,10 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.pojo.AppointmentModel; + +import java.util.List; + +public interface AppointmentService { + List queryAppointment(String doctor, String startTime, String endTime,String name); + +} 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 new file mode 100644 index 0000000..25acd49 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/AppointmentServiceImpl.java @@ -0,0 +1,19 @@ +package com.lyms.platform.permission.service.impl; + +import com.lyms.platform.permission.dao.master.AppointmentMapper; +import com.lyms.platform.permission.service.AppointmentService; +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); + } +} diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java index 1132c79..3e909d0 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java @@ -724,7 +724,7 @@ public class LisServiceImpl implements LisService { private String buildRef(ReferValue referValue) { if (StringUtils.isNotBlank(referValue.getEmergencyMin()) && StringUtils.isNotBlank(referValue.getEmergencyMax())) { - return "<" + referValue.getEmergencyMin() + " || " + ">" + referValue.getEmergencyMax(); + return "<" + referValue.getEmergencyMin() + " 或 " + ">" + referValue.getEmergencyMax(); } else { if (StringUtils.isNotBlank(referValue.getEmergencyMin())) { return "<" + referValue.getEmergencyMin(); diff --git a/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml new file mode 100644 index 0000000..6525b9b --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java index 8a2f32f..fc3922b 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java @@ -41,7 +41,7 @@ public class HttpClientUtil { // 设置连接池 connMgr = new PoolingHttpClientConnectionManager(); // 设置连接池大小 - connMgr.setMaxTotal(20); + connMgr.setMaxTotal(50); connMgr.setDefaultMaxPerRoute(connMgr.getMaxTotal()); RequestConfig.Builder configBuilder = RequestConfig.custom(); diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index 1f71aa5..2c6f8d8 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -140,7 +140,8 @@ public enum SerialIdEnum { CervicalCancerModel("CervicalCancerModel", 4302505773278441592L), ResidentSmgRecordModel("ResidentSmgRecordModel", 430205773278441592L), DefectiveChildModel("DefectiveChildModel", 1684816144240073408L), - WxChooseInfoModel("WxChooseInfoModel",-1814469732375965270L); + WxChooseInfoModel("WxChooseInfoModel",-1814469732375965270L), + PostpartumReport("PostpartumReport",-2956731479920504335L); private String cname; private Long cid; 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 new file mode 100644 index 0000000..de67618 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java @@ -0,0 +1,135 @@ +package com.lyms.platform.pojo; + + + +import java.util.Date; + +public class AppointmentModel { + private static final long serialVersionUID = 1L; + private Integer id; + private String bhNum; + private String vccardNo; + private String name; + private String phone; + private String age; + private String idCard; + private String sex; + private Date checkTime; + private String doctor; + private String dept; + private Date created; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getBhNum() { + return bhNum; + } + + public void setBhNum(String bhNum) { + this.bhNum = bhNum; + } + + public String getVccardNo() { + return vccardNo; + } + + public void setVccardNo(String vccardNo) { + this.vccardNo = vccardNo; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getAge() { + return age; + } + + public void setAge(String age) { + this.age = age; + } + + public String getIdCard() { + return idCard; + } + + public void setIdCard(String idCard) { + this.idCard = idCard; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public Date getCheckTime() { + return checkTime; + } + + public void setCheckTime(Date checkTime) { + this.checkTime = checkTime; + } + + public String getDoctor() { + return doctor; + } + + public void setDoctor(String doctor) { + this.doctor = doctor; + } + + public String getDept() { + return dept; + } + + public void setDept(String dept) { + this.dept = dept; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + @Override + public String toString() { + return "AppointmentModel{" + + "id=" + id + + ", bhNum='" + bhNum + '\'' + + ", vccardNo='" + vccardNo + '\'' + + ", name='" + name + '\'' + + ", phone='" + phone + '\'' + + ", age='" + age + '\'' + + ", idCard='" + idCard + '\'' + + ", sex='" + sex + '\'' + + ", checkTime=" + checkTime + + ", doctor='" + doctor + '\'' + + ", dept='" + dept + '\'' + + ", created=" + created + + '}'; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumReport.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumReport.java new file mode 100644 index 0000000..4c413b6 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PostpartumReport.java @@ -0,0 +1,147 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 产后营养指南模版 + */ +@Document(collection = "lyms_postpartum_report") +public class PostpartumReport extends BaseModel { + private static final long serialVersionUID = SerialIdEnum.PostpartumReport.getCid(); + + private String id; + //医院ID + private String hospitalId; + + //每日食物推荐量 + private List foodRecommends; + //一日食谱 + private List recipe; + //营养膳食指导 + private String guidance; + //哺乳期注意事项 + private String matters; + //次数 + private Integer num; + //高危风险id + private List riskFactorId; + //高危风险名称 + private List riskFactorName; + //风险等级颜色 + private String riskLevelId; + + private Integer yn; + + private Date created; + private Date modified; + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public List getFoodRecommends() { + return foodRecommends; + } + + public void setFoodRecommends(List foodRecommends) { + this.foodRecommends = foodRecommends; + } + + public List getRecipe() { + return recipe; + } + + public void setRecipe(List recipe) { + this.recipe = recipe; + } + + public String getGuidance() { + return guidance; + } + + public void setGuidance(String guidance) { + this.guidance = guidance; + } + + public String getMatters() { + return matters; + } + + public void setMatters(String matters) { + this.matters = matters; + } + + public Integer getNum() { + return num; + } + + public void setNum(Integer num) { + this.num = num; + } + + public List getRiskFactorId() { + return riskFactorId; + } + + public void setRiskFactorId(List riskFactorId) { + this.riskFactorId = riskFactorId; + } + + public String getRiskLevelId() { + return riskLevelId; + } + + public void setRiskLevelId(String riskLevelId) { + this.riskLevelId = riskLevelId; + } + + public List getRiskFactorName() { + return riskFactorName; + } + + public void setRiskFactorName(List riskFactorName) { + this.riskFactorName = riskFactorName; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReport.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReport.java new file mode 100644 index 0000000..fffa72b --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReport.java @@ -0,0 +1,144 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * 孕期营养报告指南 + */ +@Document(collection = "lyms_pregnancy_report") +public class PregnancyReport extends BaseModel { + private static final long serialVersionUID = -1; + private String id; + //医院ID + private String hospitalId; + //当前孕期 1是孕早期 14周之前 2是孕中期 14-27周+6 3是孕晚期28周及以后 + private Integer week; + //体重类型 0为正常 1为轻 2为重 + private Integer weightType; + //高危风险id + private List riskFactorId; + //高危风险名称 + private List riskFactorName; + //综合营养指南 + private String guidance; + //注意事项 + private String matters; + //所需热量建议 + private String suggest; + //孕期营养食谱 + private List weekRecipe; + + private Integer yn; + + private Date created; + private Date modified; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getWeek() { + return week; + } + + public void setWeek(Integer week) { + this.week = week; + } + + public Integer getWeightType() { + return weightType; + } + + public void setWeightType(Integer weightType) { + this.weightType = weightType; + } + + public List getRiskFactorId() { + return riskFactorId; + } + + public void setRiskFactorId(List riskFactorId) { + this.riskFactorId = riskFactorId; + } + + public List getRiskFactorName() { + return riskFactorName; + } + + public void setRiskFactorName(List riskFactorName) { + this.riskFactorName = riskFactorName; + } + + public String getGuidance() { + return guidance; + } + + public void setGuidance(String guidance) { + this.guidance = guidance; + } + + public String getMatters() { + return matters; + } + + public void setMatters(String matters) { + this.matters = matters; + } + + public String getSuggest() { + return suggest; + } + + public void setSuggest(String suggest) { + this.suggest = suggest; + } + + public List getWeekRecipe() { + return weekRecipe; + } + + public void setWeekRecipe(List weekRecipe) { + this.weekRecipe = weekRecipe; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReportMatters.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReportMatters.java new file mode 100644 index 0000000..f78a8f0 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PregnancyReportMatters.java @@ -0,0 +1,81 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +import java.util.Date; + +/** + * 孕期营养报告注意事项 + */ +@Document(collection = "lyms_pregnancy_report_matters") +public class PregnancyReportMatters extends BaseModel { + private static final long serialVersionUID = -1; + private String id; + //医院ID + private String hospitalId; + //0是健康 1是高危 + private Integer riskType; + //当前孕周 + private Integer week; + //注意事项 + private String matters; + private Integer yn; + private Date created; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getRiskType() { + return riskType; + } + + public void setRiskType(Integer riskType) { + this.riskType = riskType; + } + + public Integer getWeek() { + return week; + } + + public void setWeek(Integer week) { + this.week = week; + } + + public String getMatters() { + return matters; + } + + public void setMatters(String matters) { + this.matters = matters; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java new file mode 100644 index 0000000..5f531de --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/PostpartumReportQuery.java @@ -0,0 +1,78 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.utils.StringUtils; + +import java.util.List; + +public class PostpartumReportQuery extends BaseQuery implements IConvertToNativeQuery { + + private String hospitalId; + + private Integer yn=-1; + + /** + * 高危因素集合 + */ + private List rFactorList; + /** + * 高危因素 + */ + private String rFactor; + + public String getrFactor() { + return rFactor; + } + + public void setrFactor(String rFactor) { + this.rFactor = rFactor; + } + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public List getrFactorList() { + return rFactorList; + } + + public void setrFactorList(List rFactorList) { + this.rFactorList = rFactorList; + } + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + + if (null != hospitalId) { + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); + } + + if (StringUtils.isNotEmpty(rFactor)) { + condition = condition.and("riskFactorId", rFactor, MongoOper.IN); + } else if (null != rFactorList && !rFactorList.isEmpty()) { + condition = condition.and("riskFactorId", rFactorList, MongoOper.IN); + } + if (-1 != yn) { + condition = condition.and("yn", yn, MongoOper.IS); + } + return condition.toMongoQuery(); +// + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportMattersQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportMattersQuery.java new file mode 100644 index 0000000..9cdd35d --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportMattersQuery.java @@ -0,0 +1,67 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; + +public class PregnancyReportMattersQuery extends BaseQuery implements IConvertToNativeQuery { + private String hospitalId; + private Integer yn=-1; + //0是健康 1是高危 + private Integer riskType; + + //当前孕周 + private Integer week; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public Integer getRiskType() { + return riskType; + } + + public void setRiskType(Integer riskType) { + this.riskType = riskType; + } + + public Integer getWeek() { + return week; + } + + public void setWeek(Integer week) { + this.week = week; + } + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + if (null != hospitalId) { + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); + } + if (null!=week){ + condition = condition.and("week", week, MongoOper.IS); + } + if (null!=riskType){ + condition = condition.and("riskType", riskType, MongoOper.IS); + } + if (-1 != yn) { + condition = condition.and("yn", yn, MongoOper.IS); + } + return condition.toMongoQuery(); + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportQuery.java new file mode 100644 index 0000000..7a0dce1 --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/query/PregnancyReportQuery.java @@ -0,0 +1,102 @@ +package com.lyms.platform.query; + +import com.lyms.platform.common.base.IConvertToNativeQuery; +import com.lyms.platform.common.dao.BaseQuery; +import com.lyms.platform.common.dao.operator.MongoCondition; +import com.lyms.platform.common.dao.operator.MongoOper; +import com.lyms.platform.common.dao.operator.MongoQuery; +import com.lyms.platform.common.utils.StringUtils; + +import java.util.List; + +public class PregnancyReportQuery extends BaseQuery implements IConvertToNativeQuery { + + private String hospitalId; + + private Integer yn=-1; + + /** + * 高危因素集合 + */ + private List rFactorList; + /** + * 高危因素 + */ + private String rFactor; + + //当前孕周 + private Integer week; + //体重类型 0为正常 1为轻 2为重 + private Integer weightType; + + public String getHospitalId() { + return hospitalId; + } + + public void setHospitalId(String hospitalId) { + this.hospitalId = hospitalId; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public List getrFactorList() { + return rFactorList; + } + + public void setrFactorList(List rFactorList) { + this.rFactorList = rFactorList; + } + + public String getrFactor() { + return rFactor; + } + + public void setrFactor(String rFactor) { + this.rFactor = rFactor; + } + + public Integer getWeek() { + return week; + } + + public void setWeek(Integer week) { + this.week = week; + } + + public Integer getWeightType() { + return weightType; + } + + public void setWeightType(Integer weightType) { + this.weightType = weightType; + } + + @Override + public MongoQuery convertToQuery() { + MongoCondition condition = MongoCondition.newInstance(); + if (null != hospitalId) { + condition = condition.and("hospitalId", hospitalId, MongoOper.IS); + } + if (null!=week){ + condition = condition.and("week", week, MongoOper.IS); + } + if (null!=weightType){ + condition = condition.and("weightType", weightType, MongoOper.IS); + } + if (StringUtils.isNotEmpty(rFactor)) { + condition = condition.and("riskFactorId", rFactor, MongoOper.IN); + } else if (null != rFactorList && !rFactorList.isEmpty()) { + condition = condition.and("riskFactorId", rFactorList, MongoOper.IN); + } + if (-1 != yn) { + condition = condition.and("yn", yn, MongoOper.IS); + } + return condition.toMongoQuery(); + } +} -- 1.8.3.1