diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java index 63114b7..f74af62 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyEarFacade.java @@ -650,12 +650,6 @@ public class BabyEarFacade { babyEarBaseView.setBarCode(babyPatientExtendEar.getBarCode()); babyEarBaseView.setNation(getBasicConfig(babyPatientExtendEar.getNation())); babyEarBaseView.setRemark(babyModel.getMremark()); - if (babyModel.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId()) { - babyEarBaseView.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getName()); - } else if (babyModel.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId()) { - babyEarBaseView.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getName()); - } - babyEarBaseView.setServiceType(ServiceTypeEnums.getTitleById(babyModel.getServiceType())); /* 诊断指导 */ String diagnosis = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(babyPatientExtendEar.getDischargeDiagnosis())) { @@ -1409,7 +1403,7 @@ public class BabyEarFacade { babyEarBaseView.setFphone(babyEarBase.getFphone()); babyEarBaseView.setCreateTime(babyEarBase.getCreateTime()); babyEarBaseView.setVcCardNo(babyEarBase.getVcCardNo()); - babyEarBaseView.setServiceType(ServiceTypeEnums.getTitleById(babyEarBase.getServiceStatus())); + babyEarBaseView.setServiceType(ServiceTypeEnums.getTitleById(babyEarBase.getServiceType())); babyEarBaseView.setServiceStatus(ServiceStatusEnums.getNameById(babyEarBase.getServiceStatus())); babyEarBaseView.setMonthAge(babyEarBase.getMonthAge()); return babyEarBaseView;