Commit 7549f0405bb92e8e4215c4a315cc68a6a4f31fc1
1 parent
e78e7f9519
Exists in
master
and in
6 other branches
改bug
Showing 2 changed files with 12 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
7549f04
... | ... | @@ -1248,6 +1248,11 @@ |
1248 | 1248 | if (patients != null && patients.size() > 0) { |
1249 | 1249 | Patients p = patients.get(0); |
1250 | 1250 | result = getResult(p); |
1251 | + /** 末次月经和纠正末次月经反起来返回 */ | |
1252 | + if(p.getFuckLastMens() != null) { | |
1253 | + result.setFuckLastMens(DateUtil.getyyyy_MM_dd(p.getLastMenses())); | |
1254 | + result.setLastMenstrualPeriod(DateUtil.getyyyy_MM_dd(p.getFuckLastMens())); | |
1255 | + } | |
1251 | 1256 | } |
1252 | 1257 | |
1253 | 1258 | BaseObjectResponse objectResponse = new BaseObjectResponse(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
7549f04
... | ... | @@ -127,6 +127,12 @@ |
127 | 127 | } |
128 | 128 | |
129 | 129 | Map<String, Object> map = getPatientViewData(data,id); |
130 | + /** 末次月经和纠正末次月经反起来返回 */ | |
131 | + if(data.getFuckLastMens() != null) { | |
132 | + map.put("fuckLastMens", DateUtil.getyyyy_MM_dd(data.getLastMenses())); | |
133 | + map.put("lastMenses", DateUtil.getyyyy_MM_dd(data.getFuckLastMens())); | |
134 | + } | |
135 | + | |
130 | 136 | br.setData(map); |
131 | 137 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
132 | 138 | br.setErrormsg("成功"); |
... | ... | @@ -140,6 +146,7 @@ |
140 | 146 | map.put("lastMenstrualPeriodBasis", BasisEnums.getName(data.getLastMenstrualPeriodBasis())); |
141 | 147 | map.put("lastMenstrualPeriodBasisDoctorId", couponMapper.findUserName(data.getLastMenstrualPeriodBasis())); |
142 | 148 | map.put("lastMenstrualPeriodBasisDate", data.getLastMenstrualPeriodBasisDate()); |
149 | + | |
143 | 150 | |
144 | 151 | |
145 | 152 | map.put("isSendCoupon", data.isSendCoupon() == null ? false : data.isSendCoupon()); |