diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index b990117..ae88c93 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -1114,7 +1114,6 @@ public class BookbuildingFacade { public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) { Patients patient = new Patients(); - // 纠正末次月经和末次月经反起存 if (StringUtils.isEmpty(yunRequest.getFuckLastMens())) { patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod())); @@ -1278,11 +1277,9 @@ public class BookbuildingFacade { result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getLastMenses())); result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getFuckLastMens())); } - result.setLastMenstrualPeriodBasis(BasisEnums.getName(p.getLastMenstrualPeriodBasis())); - if(BasisEnums.E.getId().equals(p.getLastMenstrualPeriodBasis())) { - result.setLastMenstrualPeriodBasis(BasisEnums.getName(p.getLastMenstrualPeriodBasis()) + ":" + p.getLastMenstrualPeriodBasisOther()); - } - result.setLastMenstrualPeriodBasisDoctorId(couponMapper.getUserName(p.getLastMenstrualPeriodBasisDoctorId())); + result.setLastMenstrualPeriodBasis(p.getLastMenstrualPeriodBasis()); + result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther()); + result.setLastMenstrualPeriodBasisDoctorId(p.getLastMenstrualPeriodBasisDoctorId()); } BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id,userId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index e3baebe..469dfc1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -141,13 +141,15 @@ public class ViewFacade { public Map getPatientViewData( Patients data ,String id) { - Map map = new HashMap<>(); map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis())); map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasis())); map.put("lastMenstrualPeriodBasisDate", data.getLastMenstrualPeriodBasisDate()); - + map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis())); + if(BasisEnums.E.getId().equals(data.getLastMenstrualPeriodBasis())) { + map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()) + ":" + data.getLastMenstrualPeriodBasisOther()); + } map.put("isSendCoupon", data.isSendCoupon() == null ? false : data.isSendCoupon()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 3af133a..77de36d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -27,6 +27,16 @@ public class YunBookbuildingAddRequest { private String lastMenstrualPeriodBasisDoctorName; + private List patientSerResults; + + public List getPatientSerResults() { + return patientSerResults; + } + + public void setPatientSerResults(List patientSerResults) { + this.patientSerResults = patientSerResults; + } + public String getLastMenstrualPeriodBasisDoctorName() { return lastMenstrualPeriodBasisDoctorName; }