diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java index dfdcbbf..1b95c1d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java @@ -341,7 +341,7 @@ public class PremaritalCheckup extends BaseModel { //指导意见 private String zhiDaoYiJian; //婚检医生 - private DoctorModel hunJianDoctor; + private String hunJianDoctor; public Integer getSexType() { return sexType; @@ -1519,11 +1519,11 @@ public class PremaritalCheckup extends BaseModel { this.zhiDaoYiJian = zhiDaoYiJian; } - public DoctorModel getHunJianDoctor() { + public String getHunJianDoctor() { return hunJianDoctor; } - public void setHunJianDoctor(DoctorModel hunJianDoctor) { + public void setHunJianDoctor(String hunJianDoctor) { this.hunJianDoctor = hunJianDoctor; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index 03fc4c6..789f993 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -21,7 +21,9 @@ import com.lyms.platform.operate.web.result.PremaritalCheckupResult; import com.lyms.platform.operate.web.utils.CommonsHelper; import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.DoctorModel; import com.lyms.platform.pojo.PremaritalCheckup; @@ -55,6 +57,8 @@ public class PremaritalCheckupFacade { private OrganizationService organizationService; @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private UsersService usersService; /** * 查询单个(男/女)婚前检查 @@ -344,7 +348,15 @@ public class PremaritalCheckupFacade { checkupResult.setYiXueYiJian(result.getYiXueYiJian()); checkupResult.setYiJianQiTaDetails(result.getYiJianQiTaDetails()); checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian()); - checkupResult.setHunJianDoctor(result.getHunJianDoctor()); + String hunJianDoctor = ""; + if (result.getHunJianDoctor()!=null){ + Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor())); + if (users!=null && users.getYn()==YnEnums.YES.getId()){ + hunJianDoctor = users.getName(); + } + } +// checkupResult.setHunJianDoctor(result.getHunJianDoctor()); + checkupResult.setHunJianDoctor(hunJianDoctor); return checkupResult; } @@ -428,12 +440,14 @@ public class PremaritalCheckupFacade { map.put("yiXueYiJian", checkup.getYiXueYiJian() == null ? "" : MedicalAdviceEnum.getEnum(checkup.getYiXueYiJian()).getTitle()); map.put("residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); + String hunJianDoctor = ""; if (checkup.getHunJianDoctor()!=null){ - DoctorModel doctorModel = checkup.getHunJianDoctor(); - hunJianDoctor = doctorModel.getName(); + Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor())); + if (users!=null && users.getYn()==YnEnums.YES.getId()){ + hunJianDoctor = users.getName(); + } } - map.put("hunJianDoctor", hunJianDoctor); map.put("id", checkup.getId()); list.add(map); @@ -1037,10 +1051,11 @@ public class PremaritalCheckupFacade { map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian()); String hunJianDoctor = ""; if (checkup.getHunJianDoctor()!=null){ - DoctorModel doctorModel = checkup.getHunJianDoctor(); - hunJianDoctor = doctorModel.getName(); + Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor())); + if (users!=null && users.getYn()==YnEnums.YES.getId()){ + hunJianDoctor = users.getName(); + } } - map.put("hunJianDoctor", hunJianDoctor); list.add(map); } @@ -1448,10 +1463,11 @@ public class PremaritalCheckupFacade { map.put("zhiDaoYiJian", checkup.getZhiDaoYiJian()); String hunJianDoctor = ""; if (checkup.getHunJianDoctor()!=null){ - DoctorModel doctorModel = checkup.getHunJianDoctor(); - hunJianDoctor = doctorModel.getName(); + Users users = usersService.getUsers(Integer.parseInt(checkup.getHunJianDoctor())); + if (users!=null && users.getYn()==YnEnums.YES.getId()){ + hunJianDoctor = users.getName(); + } } - map.put("hunJianDoctor", hunJianDoctor); list.add(map); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java index 57d941f..5f70fac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java @@ -325,7 +325,7 @@ public class PremaritalCheckupAddRequest { //指导意见 private String zhiDaoYiJian; //婚检医生 - private DoctorModel hunJianDoctor; + private String hunJianDoctor; private Integer sexType; @@ -1474,11 +1474,11 @@ public class PremaritalCheckupAddRequest { this.zhiDaoYiJian = zhiDaoYiJian; } - public DoctorModel getHunJianDoctor() { + public String getHunJianDoctor() { return hunJianDoctor; } - public void setHunJianDoctor(DoctorModel hunJianDoctor) { + public void setHunJianDoctor(String hunJianDoctor) { this.hunJianDoctor = hunJianDoctor; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java index 0d9e748..b06085a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java @@ -328,7 +328,7 @@ public class PremaritalCheckupResult { //指导意见 private String zhiDaoYiJian; //婚检医生 - private DoctorModel hunJianDoctor; + private String hunJianDoctor; public String getId() { return id; @@ -1482,11 +1482,11 @@ public class PremaritalCheckupResult { this.zhiDaoYiJian = zhiDaoYiJian; } - public DoctorModel getHunJianDoctor() { + public String getHunJianDoctor() { return hunJianDoctor; } - public void setHunJianDoctor(DoctorModel hunJianDoctor) { + public void setHunJianDoctor(String hunJianDoctor) { this.hunJianDoctor = hunJianDoctor; } }