Commit fbc2aa615ce35a2994821d5cbecf2350ac24a86b
1 parent
85456a5274
Exists in
master
and in
6 other branches
产后随访
Showing 1 changed file with 7 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
fbc2aa6
... | ... | @@ -1348,16 +1348,19 @@ |
1348 | 1348 | //预约联系结果 |
1349 | 1349 | if (deliverModel.getContactResult() != null) { |
1350 | 1350 | matdeliverFollowListResult.setContactResultStr(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getContactResult())); |
1351 | + if(deliverModel.getContactResult() == 1){//预约成功,返回访视类型 | |
1352 | + //访视类型 | |
1353 | + if (deliverModel.getMakeType() != null) { | |
1354 | + matdeliverFollowListResult.setMakeType(PostpartumFollowMakeEnums.TypeEnum.getTitle(deliverModel.getMakeType())); | |
1355 | + } | |
1356 | + } | |
1351 | 1357 | } |
1352 | 1358 | //产妇确认结果 |
1353 | 1359 | if (deliverModel.getVisitAffirm() != null) { |
1354 | 1360 | matdeliverFollowListResult.setVisitAffirm(PostpartumFollowMakeEnums.VisitAffirmEnum.getTitle(deliverModel.getVisitAffirm())); |
1355 | 1361 | } |
1356 | 1362 | |
1357 | - //访视类型 | |
1358 | - if (deliverModel.getMakeType() != null) { | |
1359 | - matdeliverFollowListResult.setMakeType(PostpartumFollowMakeEnums.TypeEnum.getTitle(deliverModel.getMakeType())); | |
1360 | - } | |
1363 | + | |
1361 | 1364 | |
1362 | 1365 | //下次访视时间 |
1363 | 1366 | if (deliverModel.getNextVisitDate() != null) { |