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 f4c723e..6fe1961 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 @@ -1966,6 +1966,7 @@ public class PatientFacade extends BaseServiceImpl { if (patientsQueryRequest.getQueryType() != null) { // 0 高危孕妇 1 全部孕妇 2全部产妇 3产后孕妇统计导出 if (patientsQueryRequest.getQueryType() == 0) { + String hospital = autoMatchFacade.getHospitalId(userId); listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId, null, Boolean.FALSE); List list = listResponse.getData(); for (Object obj : list) { @@ -1973,6 +1974,10 @@ public class PatientFacade extends BaseServiceImpl { RiskPatientsResult rp = (RiskPatientsResult) obj; data.put("name", rp.getName()); data.put("age", rp.getAge()); + if ("1000000115".equals(hospital)) { + data.put("cardNo", rp.getCardNo()); + data.put("vcCardNo", rp.getVcCardNo()); + } data.put("dueWeek", rp.getDueWeek()); data.put("rLevel", getLevel(rp.getrLevel())); data.put("rFactor", rp.getrFactor()); @@ -1990,6 +1995,10 @@ public class PatientFacade extends BaseServiceImpl { } cnames.put("name", "姓名"); cnames.put("age", "当前年龄"); + if ("1000000115".equals(hospital)) { + cnames.put("cardNo", "身份证"); + cnames.put("vcCardNo", "就诊卡号"); + } cnames.put("dueWeek", "当前孕周"); cnames.put("rLevel", "高危等级"); cnames.put("rFactor", "高危风险因素"); @@ -2004,6 +2013,7 @@ public class PatientFacade extends BaseServiceImpl { cnames.put("serviceType", "服务类型"); cnames.put("serviceStatus", "服务状态"); } else if (patientsQueryRequest.getQueryType() == 1) { + String hospital = autoMatchFacade.getHospitalId(userId); listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, null, 1, userId, null, Boolean.FALSE); List list = listResponse.getData(); for (Object obj : list) { @@ -2011,6 +2021,10 @@ public class PatientFacade extends BaseServiceImpl { QuanPatientsResult rp = (QuanPatientsResult) obj; data.put("name", rp.getName()); data.put("age", rp.getAge()); + if ("1000000115".equals(hospital)) { + data.put("cardNo", rp.getCardNo()); + data.put("vcCardNo", rp.getVcCardNo()); + } data.put("dueWeek", rp.getDueWeek()); data.put("rLevel", getLevel(rp.getrLevel())); data.put("cTimes", rp.getcTimes()); @@ -2026,6 +2040,10 @@ public class PatientFacade extends BaseServiceImpl { } cnames.put("name", "姓名"); cnames.put("age", "当前年龄"); + if ("1000000115".equals(hospital)) { + cnames.put("cardNo", "身份证"); + cnames.put("vcCardNo", "就诊卡号"); + } cnames.put("dueWeek", "当前孕周"); cnames.put("rLevel", "高危等级"); cnames.put("cTimes", "总产检次数"); @@ -2052,6 +2070,10 @@ public class PatientFacade extends BaseServiceImpl { data.put("createdWeek", rp.getCreatedWeek()); data.put("yyzyfmHospitalId", rp.getYyzyfmHospitalId()); } + if ("1000000115".equals(hospital)) { + data.put("cardNo", rp.getCardNo()); + data.put("vcCardNo", rp.getVcCardNo()); + } data.put("cTime", rp.getcTime()); data.put("rLevel", getLevel(rp.getrLevel())); data.put("rFactor", rp.getrFactor()); @@ -2068,6 +2090,10 @@ public class PatientFacade extends BaseServiceImpl { } cnames.put("name", "姓名"); cnames.put("age", "分娩年龄"); + if ("1000000115".equals(hospital)) { + cnames.put("cardNo", "身份证"); + cnames.put("vcCardNo", "就诊卡号"); + } cnames.put("dueWeek", "分娩日期"); if ("2100001377".equals(hospital)) { cnames.put("bTime", "建档时间"); 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 1f38de0..30dc9d1 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,13 @@ import java.util.Map; */ public class QuanChanResult implements IBasicResultConvert { public static final String SPIT = "-"; + + /** + * 身份证号码 + */ + private String cardNo; + + private String vcCardNo; //预约住院分娩医院(滦平定制) private String yyzyfmHospitalId; @@ -101,6 +108,22 @@ public class QuanChanResult implements IBasicResultConvert getrLevel() { return rLevel; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java index 549db3c..5d0862f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java @@ -87,6 +87,28 @@ public class QuanPatientsResult implements IBasicResultConvert> { for (Patients patients : patientses) { StopWatch stopWatch = new StopWatch("QuanChanPatientWorker -" + patients.getId()); QuanChanResult chanResult = new QuanChanResult(); + chanResult.setVcCardNo(patients.getVcCardNo()); + chanResult.setCardNo(patients.getCardNo()); + chanResult.setYi("-"); chanResult.setEr("-"); chanResult.setSan("-"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java index d779c16..4d14d76 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java @@ -75,6 +75,9 @@ public class QuanPatientWorker implements Callable> { StopWatch stopWatch = new StopWatch("QuanPatientWorker -" + patients.getId()); QuanPatientsResult quanPatientsResult = new QuanPatientsResult(); + quanPatientsResult.setVcCardNo(patients.getVcCardNo()); + quanPatientsResult.setCardNo(patients.getCardNo()); + quanPatientsResult.setYi("-"); quanPatientsResult.setEr("-"); quanPatientsResult.setSan("-"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java index ffeb3e6..d1206e2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/WorkHR.java @@ -73,6 +73,8 @@ public class WorkHR implements Callable> { StopWatch stopWatch = new StopWatch("WorkHR -" + patients.getId()); RiskPatientsResult riskPatientsResult = new RiskPatientsResult(); riskPatientsResult.convertToResult(patients); + riskPatientsResult.setVcCardNo(patients.getVcCardNo()); + riskPatientsResult.setCardNo(patients.getCardNo()); if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) { if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor()));