From 8efcfb4cc4de68cdfd2754abc18ef35c40007565 Mon Sep 17 00:00:00 2001 From: dongqin <123456> Date: Tue, 10 Dec 2019 15:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=20=E7=BB=93=E6=9E=9C=E6=8C=89=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=80=92=E5=BA=8F=20,=E6=B7=BB=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E5=8C=BB=E9=99=A2=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/result/IndividualCaseResult.java | 10 +++++++++ .../service/impl/IndividualCaseServiceImpl.java | 24 +++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/IndividualCaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/IndividualCaseResult.java index c7a95f8..e216458 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/IndividualCaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/IndividualCaseResult.java @@ -24,6 +24,16 @@ public class IndividualCaseResult implements Serializable { private String timeAxisStr; + private String checkHospitalStr; + + public String getCheckHospitalStr() { + return checkHospitalStr; + } + + public void setCheckHospitalStr(String checkHospitalStr) { + this.checkHospitalStr = checkHospitalStr; + } + public String getTimeAxisStr() { return timeAxisStr; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java index b99aeed..fdbf130 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/IndividualCaseServiceImpl.java @@ -21,7 +21,9 @@ import com.lyms.platform.operate.web.result.IndividualCaseResult; import com.lyms.platform.operate.web.service.IndividualCaseService; import com.lyms.platform.operate.web.utils.CollectionUtils; 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; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.AntExChuModel; import com.lyms.platform.pojo.AntenatalExaminationModel; @@ -42,6 +44,9 @@ public class IndividualCaseServiceImpl implements IndividualCaseService { @Autowired private HosptialHighRiskService hosptialHighRiskService; + @Autowired + private OrganizationService organizationService; + /** * 产前妊娠风险评估记录 * @@ -61,20 +66,21 @@ public class IndividualCaseServiceImpl implements IndividualCaseService { List antExChuModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId)), AntExChuModel.class); if (CollectionUtils.isNotEmpty(antExChuModels)) { AntExChuModel antExChuModel = antExChuModels.get(0); + String hospitalId = antExChuModel.getHospitalId(); String highRisks = antExChuModel.getHighrisk(); String otherHighRisk = antExChuModel.getOtherHighRisk(); - IndividualCaseResult result = getInfosIndividualCaseResult(patient, antExChuModel.getProdDoctor(), highRisks, antExChuModel.getHighriskDesc(), otherHighRisk, antExChuModel.getCheckTime()); + IndividualCaseResult result = getInfosIndividualCaseResult(patient, antExChuModel.getProdDoctor(), highRisks, antExChuModel.getHighriskDesc(), otherHighRisk, antExChuModel.getCheckTime(), hospitalId); results.add(result); } - List antenatalExaminationModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId)).with(new Sort(Sort.Direction.ASC, "created")), AntenatalExaminationModel.class); + List antenatalExaminationModels = mongoTemplate.find(Query.query(Criteria.where("parentId").is(patientId)).with(new Sort(Sort.Direction.DESC, "created")), AntenatalExaminationModel.class); if (CollectionUtils.isNotEmpty(antenatalExaminationModels)) { for (AntenatalExaminationModel examinationModel : antenatalExaminationModels) { String riskFactors = examinationModel.getRiskFactor(); String otherRisk = examinationModel.getOtherRisk(); - IndividualCaseResult result = getInfosIndividualCaseResult(patient, examinationModel.getCheckDoctor(), riskFactors, examinationModel.getHighriskDesc(), otherRisk, examinationModel.getCheckDate()); + String hospitalId = examinationModel.getHospitalId(); + IndividualCaseResult result = getInfosIndividualCaseResult(patient, examinationModel.getCheckDoctor(), riskFactors, examinationModel.getHighriskDesc(), otherRisk, examinationModel.getCheckDate(), hospitalId); results.add(result); - } } BaseResponse baseResponse = new BaseResponse(); @@ -97,9 +103,17 @@ public class IndividualCaseServiceImpl implements IndividualCaseService { * @param checkTime 产检时间 * @return */ - private IndividualCaseResult getInfosIndividualCaseResult(Patients patient, String doctor, String highRisks, String highRiskDesc, String otherHighRisk, Date checkTime) { + private IndividualCaseResult getInfosIndividualCaseResult(Patients patient, String doctor, String highRisks, String highRiskDesc, String otherHighRisk, Date checkTime, String hospitalId) { List list = JsonUtil.toList(highRisks, String.class); IndividualCaseResult result = new IndividualCaseResult<>(); + String checkHospitalStr = ""; + if (StringUtils.isNotEmpty(hospitalId)) { + Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); + if (organization != null) { + checkHospitalStr = organization.getName(); + } + } + result.setCheckHospitalStr(checkHospitalStr); result.setName(patient.getUsername()); result.setIdCard(patient.getCardNo()); Users users = usersService.getUsers(Integer.parseInt(doctor)); -- 1.8.3.1