diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java index 85bcd29..7c40812 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientSerEnums.java @@ -13,7 +13,8 @@ import java.util.Map; public class PatientSerEnums { //服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) public enum SerTypeEnums{ - gwjzzd(1,"高危精准指导"), + bzfw(6, "标准服务"), + gwjzzd(1,"孕期精准医疗"), tz(2,"体重管理"), xt(3, "血糖管理"), xy(4, "血压管理"), 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 5fcd0ae..16bde3b 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 @@ -156,10 +156,16 @@ public class PatientServiceFacade { ps.setSerType(Integer.parseInt(psType)); //默认已经领取 ps.setStatus(2); + //默认待同步 + ps.setSynStatus(1); //领取时间 ps.setReceiveDate(new Date()); //领取操作医生id ps.setReceiveUser(String.valueOf(id)); + //服务开通操作时间 + ps.setUpdateDate(new Date()); + //服务开通操作人 + ps.setUpdateUser(String.valueOf(id)); patientServiceService.addPatientService(ps); operateLogFacade.addAddOptLog(id, Integer.valueOf(hospitalId), ps, OptActionEnums.ADD.getId(), "开通增值服务"); @@ -192,6 +198,8 @@ public class PatientServiceFacade { //根据用户id获取医院ID ps.setUpdateDate(new Date()); ps.setUpdateUser(String.valueOf(id)); + //待同步 + ps.setSynStatus(1); PatientService before = patientServiceService.getPatientService(ps.getId()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java index 8beb5c5..3347431 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientSerResult.java @@ -65,6 +65,14 @@ public class PatientSerResult { */ private String updateDate; /** + * 修改人 + */ + private String updateUser; + /** + * 开通医院 + */ + private String hospitalName; + /** * 开通医生名称 */ private String createUserStr; @@ -92,6 +100,22 @@ public class PatientSerResult { */ private String backUser; + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + public List getrLevel() { return rLevel; }