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 aa390f8..e04e4c2 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 @@ -2273,6 +2273,7 @@ public class PatientFacade extends BaseServiceImpl { data.put("serviceType", rp.getServiceType()); data.put("serviceStatus", rp.getServiceStatus()); data.put("remark", rp.getRemark()); + data.put("normal", rp.getNormal()); datas.add(data); }else { //全部产妇 @@ -2293,6 +2294,8 @@ public class PatientFacade extends BaseServiceImpl { data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone())); data.put("cardNo", patientsQueryRequest.getIsEncry() == 0 ? rp.getCardNo() : StringUtils.encryCardNo(rp.getCardNo())); data.put("remark", rp.getRemark()); + data.put("dueWeek", rp.getDueWeek()); + data.put("normal", rp.getNormal()); datas.add(data); } } @@ -2328,6 +2331,7 @@ public class PatientFacade extends BaseServiceImpl { cnames.put("cardNo", "身份证"); cnames.put("dueWeek", "当前孕周"); cnames.put("bTime", "建档日期"); + cnames.put("normal", "建档状态"); cnames.put("cTimes", "产检次数"); cnames.put("createdWeek", "建档孕周"); cnames.put("dueDate", "预产期"); @@ -2349,6 +2353,8 @@ public class PatientFacade extends BaseServiceImpl { cnames.put("age", "分娩年龄"); cnames.put("dueWeek", "分娩日期"); cnames.put("createdWeek", "建档孕周"); + cnames.put("normal", "建档状态"); + cnames.put("dueWeek", "分娩孕周"); cnames.put("cTimes", "总复查次数"); cnames.put("tireNumber", "胎数"); cnames.put("rLevel", "高危等级"); 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 247e253..293a587 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 @@ -109,6 +109,19 @@ public class QuanChanResult implements IBasicResultConvert> { stopWatch.start("query matdeliver"); List maternalDeliverModels = matDeliverService.query(matDeliverQuery); if (CollectionUtils.isNotEmpty(maternalDeliverModels)) { + //分娩孕周 + chanResult.setDueWeek(maternalDeliverModels.get(0).getDueWeek()); chanResult.setTireNumber(TaiShuEnums.getTitle(maternalDeliverModels.get(0).getTireNumber() + "")); try { chanResult.setfCh(organizationService.getOrganization(Integer.valueOf(maternalDeliverModels.get(0).getHospitalId())).getName()); @@ -367,6 +369,7 @@ public class QuanChanPatientWorker implements Callable > { } chanResult.sethScore(patients.getRiskScore()); + chanResult.setNormal(StringUtils.isNotEmpty(patients.getNormal())?"2".equals(patients.getNormal())?"补录":"正常":"正常"); data.add(chanResult); logger.debug(stopWatch.toString()); } 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 7d86c88..41817de 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 @@ -263,6 +263,8 @@ public class QuanPatientWorker implements Callable> { // HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true); // quanPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel())); quanPatientsResult.setcTime(nextCheckTime); + //补录、正常 + quanPatientsResult.setNormal(StringUtils.isNotEmpty(patients.getNormal())?"2".equals(patients.getNormal())?"补录":"正常":"正常"); List level = new ArrayList(); if (StringUtils.isNotEmpty(patients.getRiskLevelId())) { try {