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 6660349..1a6246c 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 @@ -40,6 +40,14 @@ public class PatientMarkHospitalQuery extends BaseQuery { */ private Date backDate; /** + * 回院操作开始时间 + */ + private Date backStartDate; + /** + * 回院操作结束时间 + */ + private Date backEndDate; + /** * 回院预约时间 */ private Date backMakeDate; @@ -68,6 +76,14 @@ public class PatientMarkHospitalQuery extends BaseQuery { */ private Date inHospitDate; /** + * 住院操作开始时间 + */ + private Date inHospitStartDate; + /** + * 住院操作结束时间 + */ + private Date inHospitEndDate; + /** * 住院预约时间 */ private Date inHospitMakeDate; @@ -120,6 +136,38 @@ public class PatientMarkHospitalQuery extends BaseQuery { */ private Integer hospitType; + public Date getBackStartDate() { + return backStartDate; + } + + public void setBackStartDate(Date backStartDate) { + this.backStartDate = backStartDate; + } + + public Date getBackEndDate() { + return backEndDate; + } + + public void setBackEndDate(Date backEndDate) { + this.backEndDate = backEndDate; + } + + public Date getInHospitStartDate() { + return inHospitStartDate; + } + + public void setInHospitStartDate(Date inHospitStartDate) { + this.inHospitStartDate = inHospitStartDate; + } + + public Date getInHospitEndDate() { + return inHospitEndDate; + } + + public void setInHospitEndDate(Date inHospitEndDate) { + this.inHospitEndDate = inHospitEndDate; + } + public Integer getHospitType() { return hospitType; } 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 e13c936..dfe24a4 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml @@ -168,6 +168,18 @@ and back_date = #{backDate,jdbcType=TIMESTAMP} + + AND + + + + AND + =0 + ]]> + and back_make_date = #{backMakeDate,jdbcType=TIMESTAMP} @@ -189,6 +201,18 @@ and in_hospit_date = #{inHospitDate,jdbcType=TIMESTAMP} + + AND + + + + AND + =0 + ]]> + and in_hospit_make_date = #{inHospitMakeDate,jdbcType=TIMESTAMP} 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 b9d14f5..6e401c9 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 @@ -18,7 +18,7 @@ public enum MakeHospitalEnums { private int id; private String name; - //服务类型 + //失败原因 public static List getMakeHospital() { List list = new ArrayList<>(); for (MakeHospitalEnums enums : MakeHospitalEnums.values()) { 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 8b648a1..171672c 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 @@ -103,6 +103,8 @@ public class PatientMarkHospServiceFacade { ps.setId(UUID.randomUUID().toString().replace("-", "")); ps.setHospitalId(hospitalId); + ps.setMakeDoctor(String.valueOf(id)); + ps.setMakeDate(new Date()); ps.setBackStatus(1); ps.setInHospitStatus(1); patientMarkHospitalService.addPatientMarkHospital(ps); @@ -125,8 +127,7 @@ public class PatientMarkHospServiceFacade { public BaseResponse updatePatientMarkHospital(PatientMarkHospital ps, int type, Integer id) { //根据用户id获取医院ID String hospitalId = autoMatchFacade.getHospitalId(id); - //根据用户id获取医院ID - patientMarkHospitalService.updatePatientMarkHospital(ps); + PatientMarkHospitalLog markHospitalLog = new PatientMarkHospitalLog(); markHospitalLog.setId(UUID.randomUUID().toString().replace("-", "")); @@ -139,6 +140,8 @@ public class PatientMarkHospServiceFacade { markHospitalLog.setMarkeDoctor(ps.getMakeDoctor()); markHospitalLog.setMarkeDate(ps.getMakeDate()); markHospitalLog.setMarkeType(1); + ps.setMakeDoctor(String.valueOf(id)); + ps.setMakeDate(new Date()); } else if (type == 2) {//回院提醒 markHospitalLog.setRemResult(ps.getBackResult()); markHospitalLog.setMakeDate(ps.getBackMakeDate()); @@ -147,6 +150,9 @@ public class PatientMarkHospServiceFacade { markHospitalLog.setMarkeDoctor(ps.getBackDoctor()); markHospitalLog.setMarkeDate(ps.getBackDate()); markHospitalLog.setMarkeType(2); + ps.setBackDoctor(String.valueOf(id)); + ps.setBackDate(new Date()); + ps.setBackStatus(2); } else if (type == 3) {//住院提醒 markHospitalLog.setRemResult(ps.getInHospitResult()); markHospitalLog.setMakeDate(ps.getInHospitMakeDate()); @@ -155,7 +161,12 @@ public class PatientMarkHospServiceFacade { markHospitalLog.setMarkeDoctor(ps.getInHospitDoctor()); markHospitalLog.setMarkeDate(ps.getInHospitDate()); markHospitalLog.setMarkeType(3); + ps.setInHospitDoctor(String.valueOf(id)); + ps.setInHospitDate(new Date()); + ps.setInHospitStatus(2); } + //根据用户id获取医院ID + patientMarkHospitalService.updatePatientMarkHospital(ps); patientMarkHospitalLogService.addPatientMarkHospitalLog(markHospitalLog); BaseResponse baseResponse = new BaseResponse(); baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); @@ -199,6 +210,8 @@ public class PatientMarkHospServiceFacade { result.setBackResult(ps.getBackResult()); if (ps.getBackResult() != null) { result.setBackResultStr(ps.getBackResult() == 1 ? "成功" : "失败"); + }else{ + result.setBackResultStr("--"); } if (ps.getBackDoctor() != null) { Users users = usersService.getUsers(Integer.parseInt(ps.getBackDoctor())); @@ -222,7 +235,8 @@ public class PatientMarkHospServiceFacade { if (ps.getInHospitResult() != null) { result.setInHospitResult(ps.getInHospitResult()); result.setInHospitResultStr(ps.getInHospitResult() == 1 ? "成功" : "失败"); - + }else{ + result.setInHospitResultStr("--"); } if(ps.getInHospitDoctor()!=null){ Users users = usersService.getUsers(Integer.parseInt(ps.getInHospitDoctor())); @@ -242,13 +256,22 @@ public class PatientMarkHospServiceFacade { } if (ps.getHospitStatus() != null) { - result.setConfirmStatus(ps.getHospitStatus()); - result.setConfirmStatusStr(ps.getHospitStatus() == 1 ? "待住院" : "已住院"); + result.setHospitStatus(ps.getHospitStatus()); + result.setHospitStatusStr(ps.getHospitStatus() == 1 ? "待住院" : "已住院"); + }else{ + result.setHospitStatusStr("--"); + } + if(ps.getHospitDate()!=null){ + result.setHospitDate(DateUtil.getyyyy_MM_dd(ps.getHospitDate())); + }else{ + result.setHospitDate("--"); } - result.setConfirmDate(DateUtil.getyyyy_MM_dd(ps.getHospitDate())); if (ps.getHospitType() != null) { - result.setConfirmType(ps.getHospitType() == 1 ? "分娩住院" : "其他住院"); + result.setHospitTypeStr(ps.getHospitType() == 1 ? "分娩住院" : "其他住院"); + }else{ + result.setHospitTypeStr("--"); } + result.setHospitType(ps.getHospitType()); result.setMakeInHospitDate(DateUtil.getyyyy_MM_dd(ps.getMakeInHospitDate())); result.setMakeDate(DateUtil.getyyyy_MM_dd(ps.getMakeDate())); if(ps.getMakeDoctor()!=null){ @@ -306,16 +329,16 @@ public class PatientMarkHospServiceFacade { patientMarkHospQuery.setBackStatus(patientMarkRequest.getStatus()); patientMarkHospQuery.setBackResult(patientMarkRequest.getResult()); patientMarkHospQuery.setBackFailure(patientMarkRequest.getFailure()); - patientMarkHospQuery.setMakeStartDate(patientMarkRequest.getMakeStartDate()); - patientMarkHospQuery.setMakeEndDate(patientMarkRequest.getMakeEndDate()); + patientMarkHospQuery.setBackStartDate(patientMarkRequest.getMakeStartDate()); + patientMarkHospQuery.setBackEndDate(patientMarkRequest.getMakeEndDate()); } else if (patientMarkRequest.getType() == 3) {//3-住院提醒 //回院提醒状态为已提醒 patientMarkHospQuery.setBackStatus(2); patientMarkHospQuery.setInHospitStatus(patientMarkRequest.getStatus()); patientMarkHospQuery.setInHospitResult(patientMarkRequest.getResult()); patientMarkHospQuery.setInHospitFailure(patientMarkRequest.getFailure()); - patientMarkHospQuery.setMakeStartDate(patientMarkRequest.getMakeStartDate()); - patientMarkHospQuery.setMakeEndDate(patientMarkRequest.getMakeEndDate()); + patientMarkHospQuery.setInHospitStartDate(patientMarkRequest.getMakeStartDate()); + patientMarkHospQuery.setInHospitEndDate(patientMarkRequest.getMakeEndDate()); } patientMarkHospQuery.setSort("hospit_date"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java index 0ea34d2..c026183 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java @@ -127,21 +127,33 @@ public class PatienMarkHospResult { /** * 住院状态 1-待住院、2-已住院 */ - private Integer confirmStatus; - private String confirmStatusStr; + private Integer hospitStatus; + private String hospitStatusStr; /** * 住院时间 */ - private String confirmDate; + private String hospitDate; /** * 住院类型 (分娩住院/其他住院) */ - private String confirmType; + private Integer hospitType; + private String hospitTypeStr; public String getId() { return id; } + public void setHospitType(Integer hospitType) { + this.hospitType = hospitType; + } + + public String getHospitTypeStr() { + return hospitTypeStr; + } + + public void setHospitTypeStr(String hospitTypeStr) { + this.hospitTypeStr = hospitTypeStr; + } public void setId(String id) { this.id = id; @@ -379,36 +391,32 @@ public class PatienMarkHospResult { this.makeRemark = makeRemark; } - public Integer getConfirmStatus() { - return confirmStatus; - } - - public void setConfirmStatus(Integer confirmStatus) { - this.confirmStatus = confirmStatus; + public Integer getHospitStatus() { + return hospitStatus; } - public String getConfirmStatusStr() { - return confirmStatusStr; + public void setHospitStatus(Integer hospitStatus) { + this.hospitStatus = hospitStatus; } - public void setConfirmStatusStr(String confirmStatusStr) { - this.confirmStatusStr = confirmStatusStr; + public String getHospitStatusStr() { + return hospitStatusStr; } - public String getConfirmDate() { - return confirmDate; + public void setHospitStatusStr(String hospitStatusStr) { + this.hospitStatusStr = hospitStatusStr; } - public void setConfirmDate(String confirmDate) { - this.confirmDate = confirmDate; + public String getHospitDate() { + return hospitDate; } - public String getConfirmType() { - return confirmType; + public void setHospitDate(String hospitDate) { + this.hospitDate = hospitDate; } - public void setConfirmType(String confirmType) { - this.confirmType = confirmType; + public Integer getHospitType() { + return hospitType; } public String getDueDate() {