jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 45e68cfb54f79fa8c1006bfc365e7b779f76a3a6

Authored by litao@lymsh.com
1 parent e2fa36cb34
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

改bug

Showing 3 changed files with 17 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 45e68cf
... ... @@ -1114,7 +1114,6 @@
1114 1114 public Patients getPatientsData(YunBookbuildingAddRequest yunRequest) {
1115 1115 Patients patient = new Patients();
1116 1116  
1117   -
1118 1117 // 纠正末次月经和末次月经反起存
1119 1118 if (StringUtils.isEmpty(yunRequest.getFuckLastMens())) {
1120 1119 patient.setLastMenses(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()));
... ... @@ -1278,11 +1277,9 @@
1278 1277 result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getLastMenses()));
1279 1278 result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getFuckLastMens()));
1280 1279 }
1281   - result.setLastMenstrualPeriodBasis(BasisEnums.getName(p.getLastMenstrualPeriodBasis()));
1282   - if(BasisEnums.E.getId().equals(p.getLastMenstrualPeriodBasis())) {
1283   - result.setLastMenstrualPeriodBasis(BasisEnums.getName(p.getLastMenstrualPeriodBasis()) + "：" + p.getLastMenstrualPeriodBasisOther());
1284   - }
1285   - result.setLastMenstrualPeriodBasisDoctorId(couponMapper.getUserName(p.getLastMenstrualPeriodBasisDoctorId()));
  1280 + result.setLastMenstrualPeriodBasis(p.getLastMenstrualPeriodBasis());
  1281 + result.setLastMenstrualPeriodBasisOther(p.getLastMenstrualPeriodBasisOther());
  1282 + result.setLastMenstrualPeriodBasisDoctorId(p.getLastMenstrualPeriodBasisDoctorId());
1286 1283 }
1287 1284  
1288 1285 BaseResponse baseResponse = patientServiceFacade.findPatientServiceList(id,userId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 45e68cf
... ... @@ -141,13 +141,15 @@
141 141  
142 142 public Map<String, Object> getPatientViewData( Patients data ,String id)
143 143 {
144   -
145 144 Map<String, Object> map = new HashMap<>();
146 145 map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()));
147 146 map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasis()));
148 147 map.put("lastMenstrualPeriodBasisDate", data.getLastMenstrualPeriodBasisDate());
149 148  
150   -
  149 + map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()));
  150 + if(BasisEnums.E.getId().equals(data.getLastMenstrualPeriodBasis())) {
  151 + map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis()) + "：" + data.getLastMenstrualPeriodBasisOther());
  152 + }
151 153  
152 154 map.put("isSendCoupon", data.isSendCoupon() == null ? false : data.isSendCoupon());
153 155  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java View file @ 45e68cf
... ... @@ -27,6 +27,16 @@
27 27  
28 28 private String lastMenstrualPeriodBasisDoctorName;
29 29  
  30 + private List patientSerResults;
  31 +
  32 + public List getPatientSerResults() {
  33 + return patientSerResults;
  34 + }
  35 +
  36 + public void setPatientSerResults(List patientSerResults) {
  37 + this.patientSerResults = patientSerResults;
  38 + }
  39 +
30 40 public String getLastMenstrualPeriodBasisDoctorName() {
31 41 return lastMenstrualPeriodBasisDoctorName;
32 42 }