diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index e56112c..eaa16c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1899,6 +1899,7 @@ public class BabyBookbuildingFacade { data.put("birthday", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getBirth()))); data.put("mommyName", StringUtils.emptyDeal(model.getMname())); data.put("mommnyPhone", StringUtils.emptyDeal(model.getMphone())); + data.put("serviceType", StringUtils.emptyDeal(model.getServiceType() == null ? "" : ServiceTypeEnums.getTitleById(model.getServiceType()))); data.put("serviceStatus", StringUtils.emptyDeal(model.getServiceStatus() == null ? "" : ServiceStatusEnums.getNameById(model.getServiceStatus()))); data.put("nextDate", StringUtils.emptyDeal(DateUtil.getyyyy_MM_dd(model.getNextDate()))); data.put("monthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(model.getBirth(), new Date()))); @@ -1926,6 +1927,7 @@ public class BabyBookbuildingFacade { cnames.put("birthday", "儿童生日"); cnames.put("mommyName", "母亲姓名"); cnames.put("mommnyPhone", "联系方式"); + cnames.put("serviceType", "服务类型"); cnames.put("serviceStatus", "服务状态"); cnames.put("nextDate", "下次预约时间"); cnames.put("monthAge", "月龄"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 203acf4..4bca2d1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -631,6 +631,8 @@ public class PatientFacade { data.put("checkDoctor", rp.getCheckDoctor()); data.put("lName", rp.getlName()); data.put("phone", rp.getRealPhone()); + data.put("serviceType", rp.getServiceType()); + data.put("serviceStatus", rp.getServiceStatus()); datas.add(data); } cnames.put("name", "姓名"); @@ -646,7 +648,8 @@ public class PatientFacade { cnames.put("checkDoctor", "产检医生"); cnames.put("lName", "登记人"); cnames.put("phone", "联系方式"); - + cnames.put("serviceType", "服务类型"); + cnames.put("serviceStatus", "服务状态"); } else if (patientsQueryRequest.getQueryType() == 1) { listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null, Boolean.FALSE); List list = listResponse.getData(); @@ -656,7 +659,6 @@ public class PatientFacade { data.put("name", rp.getName()); data.put("age", rp.getAge()); data.put("dueWeek", rp.getDueWeek()); - data.put("rLevel", getLevel(rp.getrLevel())); data.put("cTimes", rp.getcTimes()); data.put("cHTimes", rp.getcHTimes()); @@ -666,6 +668,7 @@ public class PatientFacade { data.put("lName", rp.getlName()); data.put("phone", rp.getRealPhone()); data.put("serviceType", rp.getServiceType()); + data.put("serviceStatus", rp.getServiceStatus()); datas.add(data); } cnames.put("name", "姓名"); @@ -680,6 +683,7 @@ public class PatientFacade { cnames.put("lName", "登记人"); cnames.put("phone", "联系方式"); cnames.put("serviceType", "服务类型"); + cnames.put("serviceStatus", "服务状态"); } else if (patientsQueryRequest.getQueryType() == 2) { listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null, Boolean.FALSE); List list = listResponse.getData(); @@ -696,6 +700,8 @@ public class PatientFacade { data.put("checkDoctor", rp.getCheckDoctor()); data.put("lName", rp.getlName()); data.put("phone", rp.getRealPhone()); + data.put("serviceType", "服务类型"); + data.put("serviceStatus", "服务类型"); datas.add(data); } cnames.put("name", "姓名"); @@ -708,6 +714,8 @@ public class PatientFacade { cnames.put("checkDoctor", "检查医生"); cnames.put("phone", "联系方式"); cnames.put("lName", "登记人"); + cnames.put("serviceType", "服务类型"); + cnames.put("serviceStatus", "服务状态"); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java index a04fbb3..9a9c581 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java @@ -1,6 +1,8 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.common.base.IBasicResultConvert; +import com.lyms.platform.common.enums.ServiceStatusEnums; +import com.lyms.platform.common.enums.ServiceTypeEnums; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.Patients; @@ -276,6 +278,12 @@ public class QuanChanResult implements IBasicResultConvert