diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java index 2973a4e..6c1e9b2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java @@ -679,12 +679,18 @@ public class PuerperaManageController extends BaseController { header.put("username", "姓名"); header.put("age", "年龄"); header.put("buildWeek", "建档孕周"); + String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); + + if ("2100001377".equals(hospitalId)) { + header.put("prodDoctor", "初诊时间"); + header.put("checkTime", "初诊医生"); + } header.put("phone", "联系方式"); header.put("husbandName", "丈夫姓名"); header.put("address", "居住地"); header.put("addressRegister", "户籍地"); - String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); + if ("1000000114".equals(hospitalId)) { header.put("sendCareMan", "母子保健手册"); header.put("bookbuildingDate", "发放时间"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index db7c9ec..1ca07db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -562,6 +562,12 @@ public class MatdeliverFollowFacade { BaseListResponse baseListResponse = matDeliverFacade.postpartumDeliver(matdeliverFollowRequest); Object object = baseListResponse.getObject(); + String hospital = autoMatchFacade.getHospitalId(id); + Organization org = null; + if(StringUtils.isNotEmpty(hospital)){ + org = organizationService.getOrganization(Integer.valueOf(hospital)); + } + Map cnames = new LinkedHashMap<>(); cnames.put("id", "#"); cnames.put("hospitalCityName", "地市名称"); @@ -569,6 +575,10 @@ public class MatdeliverFollowFacade { cnames.put("name", "姓名"); cnames.put("age", "年龄"); cnames.put("fmHospital", "分娩医院"); + //衡水城市限制 + if(org!=null && "12".equals(org.getCityId())){ + cnames.put("currentAddress", "访视地址"); + } cnames.put("postViewDay", "产后天数"); cnames.put("address", "居住地"); cnames.put("phone", "联系电话"); @@ -595,6 +605,10 @@ public class MatdeliverFollowFacade { result.put("name", mf.getName()); result.put("age", mf.getAge() == null ? "--" : String.valueOf(mf.getAge())); result.put("fmHospital", mf.getFmHospital()); + //衡水城市限制 + if(org!=null && "12".equals(org.getCityId())){ + result.put("currentAddress", mf.getCurrentAddress()); + } result.put("postViewDay", mf.getPostViewDay()); result.put("address", mf.getAddress()); result.put("phone", mf.getPhone()); 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 6c31777..230ee2f 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 @@ -1864,12 +1864,18 @@ public class PatientFacade { } else if (patientsQueryRequest.getQueryType() == 2) { listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 3, userId, null, Boolean.FALSE); List list = listResponse.getData(); + String hospital = autoMatchFacade.getHospitalId(userId); for (Object obj : list) { Map data = new HashMap<>(); QuanChanResult rp = (QuanChanResult) obj; data.put("name", rp.getName()); data.put("age", rp.getAge()); data.put("dueWeek", rp.getDueWeek()); + if("2100001377".equals(hospital)){ + data.put("bTime", rp.getbTime()); + data.put("createdWeek", rp.getCreatedWeek()); + data.put("yyzyfmHospitalId", rp.getYyzyfmHospitalId()); + } data.put("cTime", rp.getcTime()); data.put("rLevel", getLevel(rp.getrLevel())); data.put("rFactor", rp.getrFactor()); @@ -1887,6 +1893,11 @@ public class PatientFacade { cnames.put("name", "姓名"); cnames.put("age", "分娩年龄"); cnames.put("dueWeek", "分娩日期"); + if("2100001377".equals(hospital)){ + cnames.put("bTime", "建档时间"); + cnames.put("createdWeek", "建档孕周"); + cnames.put("yyzyfmHospitalId", "预约住院分娩医院"); + } cnames.put("rLevel", "高危等级"); cnames.put("rFactor", "高危风险因素"); cnames.put("cTime", "产后时间"); @@ -2233,7 +2244,7 @@ public class PatientFacade { public PatientManagerResult patientManager(PatientManagerRequest patientManagerRequest) { PatientManagerResult patientManagerResult = new PatientManagerResult(); - + String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setScreening(patientManagerRequest.getScreening()); @@ -2279,7 +2290,7 @@ public class PatientFacade { //排查本院隐藏建档 patientsQuery.setExtEnable(false); patientsQuery.setBuildTypeNot(1); - patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId())); + patientsQuery.setHospitalId(hospitalId); patientsQuery.setProvinceId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId()); patientsQuery.setCityId(StringUtils.isEmpty(patientManagerRequest.getCityRegisterId()) ? null : patientManagerRequest.getCityRegisterId()); patientsQuery.setAreaId(StringUtils.isEmpty(patientManagerRequest.getAreaRegisterId()) ? null : patientManagerRequest.getAreaRegisterId()); @@ -2356,7 +2367,25 @@ public class PatientFacade { System.out.println(patients.getId() + ";no user bookbuildingDoctor" + patients.getBookbuildingDoctor()); } } - + //滦平定制 + if("2100001377".equals(hospitalId)){ + //初诊 + AntExChuQuery antExChuQuery = new AntExChuQuery(); + antExChuQuery.setYn(YnEnums.YES.getId()); + antExChuQuery.setHospitalId(hospitalId); + antExChuQuery.setParentId(patients.getId()); + List antExChuModelList = antExService.queryAntExChu(antExChuQuery.convertToQuery()); + if(CollectionUtils.isNotEmpty(antExChuModelList)){ + AntExChuModel antExChuModel = antExChuModelList.get(0); + if(StringUtils.isNotEmpty(antExChuModel.getProdDoctor())){ + Users users = usersService.getUsers(Integer.parseInt(antExChuModel.getProdDoctor())); + if(users != null){ + patientManagerQueryModel.setProdDoctor(users.getName()); + } + } + patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd( antExChuModel.getCheckTime())); + } + } patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor); patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java index 81da8ae..79eb9cd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java @@ -6,6 +6,11 @@ package com.lyms.platform.operate.web.result; * @discription */ public class PatientManagerQueryModel { + //初诊时间 + private String checkTime; + //初诊医生 + private String prodDoctor; + /** * @auther HuJiaqi @@ -108,6 +113,22 @@ public class PatientManagerQueryModel { return id; } + public String getCheckTime() { + return checkTime; + } + + public void setCheckTime(String checkTime) { + this.checkTime = checkTime; + } + + public String getProdDoctor() { + return prodDoctor; + } + + public void setProdDoctor(String prodDoctor) { + this.prodDoctor = prodDoctor; + } + public void setId(String id) { this.id = id; } 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 e7519f4..1f38de0 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 @@ -16,6 +16,9 @@ import java.util.Map; */ public class QuanChanResult implements IBasicResultConvert { public static final String SPIT = "-"; + //预约住院分娩医院(滦平定制) + private String yyzyfmHospitalId; + //分娩记录加住院管床大夫 private String gcdfDoctorId; @@ -340,6 +343,14 @@ public class QuanChanResult implements IBasicResultConvert> { chanResult.setSi("-"); chanResult.setWu("-"); chanResult.convertToResult(patients); + if(StringUtils.isNotEmpty(patients.getYyzyfmHospitalId())){ + String organizationName = organizationService.getOrganizationName(patients.getYyzyfmHospitalId()); + if(StringUtils.isNotEmpty(organizationName)){ + chanResult.setYyzyfmHospitalId(organizationName); + } + } //antExQuery.setParentId(patients.getId()); antExQuery.setPid(patients.getPid()); antExQuery.setYn(YnEnums.YES.getId());