diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java index b1c84a8..6c63e4c 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/AntExRecordService.java @@ -4,7 +4,6 @@ import com.lyms.platform.biz.dal.IAntExRecordDao; import com.lyms.platform.biz.dal.IAntExRecordMDao; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.common.utils.BeanUtils; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.*; @@ -19,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -114,6 +112,7 @@ public class AntExRecordService { for (AntenatalExaminationModel antEx : list) { AntExRecordModel record = convert(antEx); if (null != record) { + //冗余到产检表 handRecord(record); } } @@ -188,6 +187,7 @@ public class AntExRecordService { public AntExRecordModel convert(AntenatalExaminationModel antEx) { AntExRecordModel antExRecordModel = new AntExRecordModel(); + antExRecordModel.setScreenResult(antEx.getScreenResult()); antExRecordModel.setParentId(antEx.getParentId()); antExRecordModel.setfId(antEx.getId()); antExRecordModel.setType(1); @@ -253,6 +253,7 @@ public class AntExRecordService { public AntExRecordModel convert(AntExChuModel antExChuModel) { AntExRecordModel antExRecordModel = new AntExRecordModel(); + antExRecordModel.setScreenResult(antExChuModel.getScreenResult()); antExRecordModel.setCheckDoctor(antExChuModel.getProdDoctor()); antExRecordModel.setHospitalId(antExChuModel.getHospitalId()); antExRecordModel.setParentId(antExChuModel.getParentId()); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java index d07d3f9..9e95438 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java @@ -1,11 +1,9 @@ package com.lyms.platform.pojo; import com.lyms.platform.beans.SerialIdEnum; -import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; -import java.io.Serializable; import java.util.Date; import java.util.List; @@ -54,6 +52,8 @@ public class AntExRecordModel extends BaseModel { private List hLevel; //风险因素 private List hRisk; + //风险因素 + private List screenResult ; private String pid; //建档时间 private Date buildTime; @@ -87,6 +87,14 @@ public class AntExRecordModel extends BaseModel { private Integer first; // 1否 2 是，是否当前医院第一次初诊 德州需求 + public List getScreenResult() { + return screenResult; + } + + public void setScreenResult(List screenResult) { + this.screenResult = screenResult; + } + public Integer getFirst() { return first; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 6458fb0..429d77b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -518,7 +518,7 @@ public class AntenatalExaminationFacade { updateLastRhTime(patients.getId(), hospitalId); setLashCTimes(excAddRequest.getParentId()); - + //冗余到产检表 antenatalExaminationService.updateAntExRecord(excAddRequest.getId(), 1); //修改数据 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java index 1f671df..b46f403 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java @@ -1,9 +1,8 @@ package com.lyms.platform.operate.web.result; -import com.lyms.platform.common.base.IBasicResultConvert; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.StringUtils; -import com.lyms.platform.pojo.*; +import com.lyms.platform.pojo.AntExRecordModel; import java.util.List; import java.util.Map; @@ -36,7 +35,8 @@ public class AntExManagerResult { private String riskScore; //本院产检次数 private int chTimes; - + //风险因素 + private String screenResult; //总产检次数 private int tTimes; //预约产检日期 @@ -56,6 +56,14 @@ public class AntExManagerResult { //产次 private int cTimes=1; + public String getScreenResult() { + return screenResult; + } + + public void setScreenResult(String screenResult) { + this.screenResult = screenResult; + } + public String getPid() { return pid; } 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 23bba51..06a3ea3 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 @@ -4,7 +4,6 @@ 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.JsonUtil; import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.Patients; import org.codehaus.jackson.annotate.JsonIgnore; @@ -55,7 +54,7 @@ public class QuanPatientsResult implements IBasicResultConvert rLevel; //风险因素 private String rFactor; + //筛查结果 + private String screenResult; //高危评分 private Integer hScore; //产检次数 @@ -84,6 +81,17 @@ public class RiskPatientsResult implements IBasicResultConvert> { ri += name.substring(0, name.length() - 1); } + //筛查结果 + List screen = e.getScreenResult(); + if (CollectionUtils.isNotEmpty(screen)) { + StringBuilder sb = new StringBuilder(56); + for (String srt : screen) { + if (org.apache.commons.lang.StringUtils.isNotEmpty(srt)) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt); + if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { + sb.append(basicConfig.getName()).append(','); + } + } + } + if (sb.toString().endsWith(",")) { + antExManagerResult.setScreenResult(sb.substring(0, sb.length() - 1)); + } else { + antExManagerResult.setScreenResult(sb.toString()); + } + } + antExManagerResult.setRiskFactor(ri); antExManagerResult.setRiskScore((e.gethScore() + score) + ""); } 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 8f90c57..f65ff61 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 @@ -13,7 +13,6 @@ import com.lyms.platform.operate.web.facade.PatientFacade; import com.lyms.platform.operate.web.result.HighScoreResult; import com.lyms.platform.operate.web.result.QuanPatientsResult; import com.lyms.platform.operate.web.utils.CommonsHelper; -import com.lyms.platform.operate.web.utils.ResolveUtils; import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; @@ -92,6 +91,24 @@ public class QuanPatientWorker implements Callable> { quanPatientsResult.setlName(patients.getBookbuildingDoctor()); } } + //筛查结果 + List screen = patients.getScreenResult(); + if (CollectionUtils.isNotEmpty(screen)) { + StringBuilder sb = new StringBuilder(56); + for (String srt : screen) { + if (StringUtils.isNotEmpty(srt)) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt); + if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { + sb.append(basicConfig.getName()).append(','); + } + } + } + if (sb.toString().endsWith(",")) { + quanPatientsResult.setScreenResult(sb.substring(0, sb.length() - 1)); + } else { + quanPatientsResult.setScreenResult(sb.toString()); + } + } quanPatientsResult.setbTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); stopWatch.start("query ant count"); antExChuQuery1.setPid(patients.getPid()); 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 a03dede..0526d79 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 @@ -176,6 +176,24 @@ public class WorkHR implements Callable> { riskPatientsResult.setServiceStatus(ServiceStatusEnums.getNameById(patients.getServiceStatus())); riskPatientsResult.setcTime(nextCheckTime); stopWatch.start("query findLastRisk"); + //筛查结果 + List screen = patients.getScreenResult(); + if (CollectionUtils.isNotEmpty(screen)) { + StringBuilder sb = new StringBuilder(56); + for (String srt : screen) { + if (StringUtils.isNotEmpty(srt)) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(srt); + if (null != basicConfig && sb.indexOf(basicConfig.getName()) == -1) { + sb.append(basicConfig.getName()).append(','); + } + } + } + if (sb.toString().endsWith(",")) { + riskPatientsResult.setScreenResult(sb.substring(0, sb.length() - 1)); + } else { + riskPatientsResult.setScreenResult(sb.toString()); + } + } //高危因素 List factor = patients.getRiskFactorId();