diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospital.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospital.java index a3f6420..80e8563 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospital.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospital.java @@ -68,7 +68,7 @@ public class PatientMarkHospital { */ private String inHospitRemark; /** - * 住院失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他）2 + * 住院失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他） */ private Integer inHospitFailure; /** @@ -99,7 +99,18 @@ public class PatientMarkHospital { * 住院时间 */ private Date hospitDate; + /** + * 住院类型(1-分娩住院、2-其他住院) + */ + private Integer hospitType; + public Integer getHospitType() { + return hospitType; + } + + public void setHospitType(Integer hospitType) { + this.hospitType = hospitType; + } public Integer getHospitStatus() { return hospitStatus; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java index c9d4ae9..6660349 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientMarkHospitalQuery.java @@ -115,7 +115,18 @@ public class PatientMarkHospitalQuery extends BaseQuery { * 住院时间 */ private Date hospitDate; + /** + * 住院类型(1-分娩住院、2-其他住院) + */ + private Integer hospitType; + public Integer getHospitType() { + return hospitType; + } + + public void setHospitType(Integer hospitType) { + this.hospitType = hospitType; + } public Date getMakeStartDate() { return makeStartDate; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml index 0fccfff..33ad3f5 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml @@ -3,111 +3,115 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - insert into patient_mark_hospital (id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date) values (#{id},#{patientId},#{pid},#{backStatus},#{backResult},#{backDoctor},#{backDate},#{backMakeDate},#{backRemark},#{backFailure},#{inHospitStatus},#{inHospitResult},#{inHospitDoctor},#{inHospitDate},#{inHospitMakeDate},#{inHospitRemark},#{inHospitFailure},#{makeInHospitDate},#{makeDate},#{makeDoctor},#{makeRemark},#{hospitalId},#{hospitStatus},#{hospitDate}) + insert into patient_mark_hospital (id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date,hospit_type) values (#{id},#{patientId},#{pid},#{backStatus},#{backResult},#{backDoctor},#{backDate},#{backMakeDate},#{backRemark},#{backFailure},#{inHospitStatus},#{inHospitResult},#{inHospitDoctor},#{inHospitDate},#{inHospitMakeDate},#{inHospitRemark},#{inHospitFailure},#{makeInHospitDate},#{makeDate},#{makeDoctor},#{makeRemark},#{hospitalId},#{hospitStatus},#{hospitDate},#{hospitType}) - - update patient_mark_hospital - patient_id = #{patientId,jdbcType=VARCHAR}, - - - pid = #{pid,jdbcType=VARCHAR}, - - - back_status = #{backStatus,jdbcType=INTEGER}, - - - back_result = #{backResult,jdbcType=INTEGER}, - - - back_doctor = #{backDoctor,jdbcType=VARCHAR}, - - - back_date = #{backDate,jdbcType=TIMESTAMP}, - - - back_make_date = #{backMakeDate,jdbcType=TIMESTAMP}, - - - back_remark = #{backRemark,jdbcType=VARCHAR}, - - - back_failure = #{backFailure,jdbcType=INTEGER}, - - - in_hospit_status = #{inHospitStatus,jdbcType=INTEGER}, - - - in_hospit_result = #{inHospitResult,jdbcType=INTEGER}, - - - in_hospit_doctor = #{inHospitDoctor,jdbcType=VARCHAR}, - - - in_hospit_date = #{inHospitDate,jdbcType=TIMESTAMP}, - - - in_hospit_make_date = #{inHospitMakeDate,jdbcType=TIMESTAMP}, - - - in_hospit_remark = #{inHospitRemark,jdbcType=VARCHAR}, - - - in_hospit_failure = #{inHospitFailure,jdbcType=INTEGER}, - - - make_in_hospit_date = #{makeInHospitDate,jdbcType=TIMESTAMP}, - - - make_date = #{makeDate,jdbcType=TIMESTAMP}, - - - make_doctor = #{makeDoctor,jdbcType=VARCHAR}, - - - make_remark = #{makeRemark,jdbcType=VARCHAR}, - - - hospital_id = #{hospitalId,jdbcType=VARCHAR}, - - - hospit_status = #{hospitStatus,jdbcType=INTEGER}, - - - hospit_date = #{hospitDate,jdbcType=TIMESTAMP}, - - + update patient_mark_hospital + + + patient_id = #{patientId,jdbcType=VARCHAR}, + + + pid = #{pid,jdbcType=VARCHAR}, + + + back_status = #{backStatus,jdbcType=INTEGER}, + + + back_result = #{backResult,jdbcType=INTEGER}, + + + back_doctor = #{backDoctor,jdbcType=VARCHAR}, + + + back_date = #{backDate,jdbcType=TIMESTAMP}, + + + back_make_date = #{backMakeDate,jdbcType=TIMESTAMP}, + + + back_remark = #{backRemark,jdbcType=VARCHAR}, + + + back_failure = #{backFailure,jdbcType=INTEGER}, + + + in_hospit_status = #{inHospitStatus,jdbcType=INTEGER}, + + + in_hospit_result = #{inHospitResult,jdbcType=INTEGER}, + + + in_hospit_doctor = #{inHospitDoctor,jdbcType=VARCHAR}, + + + in_hospit_date = #{inHospitDate,jdbcType=TIMESTAMP}, + + + in_hospit_make_date = #{inHospitMakeDate,jdbcType=TIMESTAMP}, + + + in_hospit_remark = #{inHospitRemark,jdbcType=VARCHAR}, + + + in_hospit_failure = #{inHospitFailure,jdbcType=INTEGER}, + + + make_in_hospit_date = #{makeInHospitDate,jdbcType=TIMESTAMP}, + + + make_date = #{makeDate,jdbcType=TIMESTAMP}, + + + make_doctor = #{makeDoctor,jdbcType=VARCHAR}, + + + make_remark = #{makeRemark,jdbcType=VARCHAR}, + + + hospital_id = #{hospitalId,jdbcType=VARCHAR}, + + + hospit_status = #{hospitStatus,jdbcType=INTEGER}, + + + hospit_date = #{hospitDate,jdbcType=TIMESTAMP}, + + + hospit_type = #{hospitType,jdbcType=INTEGER}, + + where id = #{id,jdbcType=VARCHAR} @@ -117,9 +121,8 @@ - @@ -134,7 +137,6 @@ - 1 = 1 @@ -233,21 +235,21 @@ - - + select + id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date from patient_mark_hospital - - + + - - select count(1) from patient_mark_hospital - + - \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/MakeHospitalEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/MakeHospitalEnums.java index d60144e..b9d14f5 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/MakeHospitalEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/MakeHospitalEnums.java @@ -1,5 +1,10 @@ package com.lyms.platform.common.enums; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * @auther yangfei * @createTime 2017年09月15日 13时58分 @@ -13,6 +18,17 @@ public enum MakeHospitalEnums { private int id; private String name; + //服务类型 + public static List getMakeHospital() { + List list = new ArrayList<>(); + for (MakeHospitalEnums enums : MakeHospitalEnums.values()) { + Map resultMap = new HashMap<>(); + resultMap.put("id", enums.getId()); + resultMap.put("name", enums.getName()); + list.add(resultMap); + } + return list; + } public static String getTitle(int id) { for (MakeHospitalEnums cfEnums : MakeHospitalEnums.values()) { 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 138ce6d..24333bc 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 @@ -191,13 +191,6 @@ public class PatientServiceController extends BaseController { baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); return baseResponse; } - //服务状态 - if(ps.getSerStatus()==null){ - baseResponse.setErrormsg("serStatus"); - baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); - return baseResponse; - } - baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); return baseResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index c01b580..32814f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -50,13 +50,14 @@ public class PatientMarkHospServiceFacade { */ public BaseResponse PatientMarkHospitalInit() { Map map = new HashMap(); + map.put("makeType",MakeHospitalEnums.getMakeHospital()); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map); } /** * 根据id查询一条住院提醒记录 - * * @param id * @return */ @@ -91,11 +92,6 @@ public class PatientMarkHospServiceFacade { if (CollectionUtils.isNotEmpty(PatientMarkHospitals)) { BaseResponse baseResponse = new BaseResponse(); baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST); - String serDoct = "产检医生"; - Users users = usersService.getUsers(Integer.parseInt(ps.getInHospitDoctor())); - if (users != null) { - serDoct = users.getName(); - } baseResponse.setErrormsg("该孕妇存在预约住院信息"); return baseResponse; } @@ -130,13 +126,13 @@ public class PatientMarkHospServiceFacade { markHospitalLog.setHospitalId(hospitalId); markHospitalLog.setPatientMakeHosId(ps.getId()); markHospitalLog.setPatientId(ps.getPatientId()); - if (type == 1) { + if (type == 1) {//预约住院 markHospitalLog.setMakeDate(ps.getMakeDate()); markHospitalLog.setMakeRemark(ps.getMakeRemark()); markHospitalLog.setMarkeDoctor(ps.getMakeDoctor()); markHospitalLog.setMarkeDate(ps.getMakeDate()); markHospitalLog.setMarkeType(1); - } else if (type == 2) { + } else if (type == 2) {//回院提醒 markHospitalLog.setRemResult(ps.getBackResult()); markHospitalLog.setMakeDate(ps.getBackMakeDate()); markHospitalLog.setMakeFailure(ps.getBackFailure()); @@ -144,7 +140,7 @@ public class PatientMarkHospServiceFacade { markHospitalLog.setMarkeDoctor(ps.getBackDoctor()); markHospitalLog.setMarkeDate(ps.getBackDate()); markHospitalLog.setMarkeType(2); - } else if (type == 3) { + } else if (type == 3) {//住院提醒 markHospitalLog.setRemResult(ps.getInHospitResult()); markHospitalLog.setMakeDate(ps.getInHospitMakeDate()); markHospitalLog.setMakeFailure(ps.getInHospitFailure()); @@ -303,6 +299,35 @@ public class PatientMarkHospServiceFacade { return baseResponse; } + /** + * 同步查询乐陵住院数据 + */ + public void synLlHisData(int offset,int page){ + + PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery(); + patientMarkHospQuery.setSort("create_date"); + patientMarkHospQuery.setNeed("y"); + patientMarkHospQuery.setOffset(offset); + patientMarkHospQuery.setLimit(100); + patientMarkHospQuery.setPage(page); + + List patientMarkHospitals = patientMarkHospitalService.queryPatientMarkHospital(patientMarkHospQuery); + for (PatientMarkHospital ps : patientMarkHospitals) { + synUpdateHisData(ps); + } + if(patientMarkHospQuery.getCount()>page*100){ + synLlHisData((page+1)*100,page+1); + } + } + + /** + * 同步更新数据库 + * @param ps + */ + public void synUpdateHisData(PatientMarkHospital ps){ + + } + public static Map initHospitType() { Map map = new HashMap<>(); map.put("00001", 1); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 2f4cf70..2142c80 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -134,6 +134,8 @@ public class PatientServiceFacade { ps.setHospitalId(hospitalId); // ps.setCreateDate(new Date()); // ps.setCreateUser(String.valueOf(id)); + //默认开通状态 + ps.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId()); //默认已经领取 ps.setStatus(2); //领取时间