diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 66cc088..6873c2b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -19,11 +19,7 @@ import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.PatientServiceService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.AntExChuModel; -import com.lyms.platform.pojo.AntExRecordModel; -import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.Patients; -import com.lyms.platform.query.AntExRecordQuery; import com.lyms.platform.query.PatientsQuery; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -78,7 +74,7 @@ public class PatientServiceFacade { PatientServiceQuery patientQuery = new PatientServiceQuery(); patientQuery.setHospitalId(hospitalId); patientQuery.setParentid(pid); - + patientQuery.setSort("create_date desc"); List patientServices = patientServiceService.queryPatientService(patientQuery); List patientSerResults = new ArrayList<>(); @@ -211,14 +207,11 @@ public class PatientServiceFacade { } result.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); result.setName(patients.getUsername()); - } - AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); - antExRecordQuery.setParentId(ps.getParentid()); - List antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery); - if(CollectionUtils.isNotEmpty(antExRecordModelList)){ - AntExRecordModel antExRecordModel = antExRecordModelList.get(0); - handleRisk(antExRecordModel,result); - result.setDueDate(DateUtil.getyyyy_MM_dd(antExRecordModel.getDueDate())); + result.setDueDate(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + //高危因素 + result.setRiskFactor(commonService.resloveFactor(patients.getRiskFactorId())); + //高危等级颜色 + result.setrLevel(commonService.findRiskLevel(patients.getRiskLevelId())); } result.setParentid(ps.getParentid()); @@ -256,49 +249,6 @@ public class PatientServiceFacade { } /** - * 处理高危 - * - * @param e - * @param patientSerResult - */ - private void handleRisk(AntExRecordModel e, PatientSerResult patientSerResult) { - if (StringUtils.isNotEmpty(e.getfId())) { - String risk = null; - if (e.getType() == 2) { - AntExChuModel model = antenatalExaminationService.findOne(e.getfId()); - if (null != model) { - risk = model.getOtherHighRisk(); - } - } else if (e.getType() == 1) { - AntenatalExaminationModel model = antenatalExaminationService.findOneById(e.getfId()); - if (null != model) { - risk = model.getOtherRisk(); - } - } - Map result = commonService.resolveOtherRisk(risk); - String name = null, level = null, score = null; - if (!result.isEmpty()) { - //高危因素名字 - name = result.get("name").toString(); - level = result.get("levelId").toString(); - score = result.get("score").toString(); - - if (org.apache.commons.lang.StringUtils.isNotEmpty(level) && !"null".equals(level)) { - e.gethLevel().add(level); - } - } - //高危因素 - patientSerResult.setrLevel(commonService.findRiskLevel(e.gethLevel())); - String ri = commonService.resloveFactor(e.gethRisk()); - if (ri.isEmpty()) { - ri = name; - } else if (StringUtils.isNotEmpty(name)) { - ri += "," + name; - } - patientSerResult.setRiskFactor(ri); - } - } - /** * 根据条件查询开通服务记录 * * @param serType 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询) @@ -319,7 +269,7 @@ public class PatientServiceFacade { patientQuery.setCreateStartDate(createStartDate); patientQuery.setCreateEndDate(createEndDate); patientQuery.setSerStatus(serStatus); - patientQuery.setSort("create_date"); + patientQuery.setSort("create_date desc"); patientQuery.setNeed("y"); patientQuery.setOffset((pageInfo.getPage() - 1) * pageInfo.getLimit()); patientQuery.setLimit(pageInfo.getLimit());