diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index 3c9ced8..2852446 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -46,6 +46,8 @@ import java.util.concurrent.TimeUnit; @Component public class SieveFacade { @Autowired + private DiagnosisService diagnosisService; + @Autowired private SieveService sieveService; @Autowired private AutoMatchFacade autoMatchFacade; @@ -477,7 +479,7 @@ public class SieveFacade { if (end > list.size()) { end = list.size(); } - listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService))); + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService, applyOrderService, organizationService,diagnosisService))); } for (Future f : listFuture) { try { @@ -668,6 +670,32 @@ public class SieveFacade { patientBaseResult.setWeight(chuModel.getYqWeight()); } + //查询产前诊断 + int a = 0; + List> mList = new ArrayList>(); + Map map = new HashMap(); + map.put("cqSieve","0");//0,未申请;1,已申请;2,已接收;3,已诊断 + map.put("diaProject",""); + map.put("diaResult","");//(0,阴性;1,阳性) + DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); + diagnosisQuery.setParentId(pat.getId()); + diagnosisQuery.setHospitalId(hospitalId); + List diaList = diagnosisService.queryDiagnosis(diagnosisQuery); + if(CollectionUtils.isNotEmpty(diaList)){ + for(DiagnosisModel diagnosisModel : diaList){ + Map m = new HashMap(); + map.put("cqSieve",diagnosisModel.getDiaStatus());//0,未申请;1,已申请;2,已接收;3,已诊断 + map.put("diaProject",diagnosisModel.getDiaProject()); + map.put("diaResult",diagnosisModel.getDiaResult());//(0,阴性;1,阳性) + a=1; + mList.add(m); + } + } + if(a == 0){ + mList.add(map); + } + patientBaseResult.setDia(mList); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index 8a2637f..bb03c27 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -55,6 +55,17 @@ public class PatientBaseResult { private String sex; + //新增产前诊断信息 + private List> dia; + + public List> getDia() { + return dia; + } + + public void setDia(List> dia) { + this.dia = dia; + } + public String getSex() { return sex; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java index 9b5d6b3..25039b5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java @@ -7,6 +7,8 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.SieveModel; import java.util.Date; +import java.util.List; +import java.util.Map; /** * Created by Administrator on 2016/7/5 0005. @@ -66,6 +68,17 @@ public class SieveListResult implements IBasicResultConvert> dia; + + public List> getDia() { + return dia; + } + + public void setDia(List> dia) { + this.dia = dia; + } + public String getApplyHospital() { return applyHospital; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java index f892ad3..a37d9e0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/SieveWorker.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.worker; import com.lyms.platform.biz.service.AntenatalExaminationService; import com.lyms.platform.biz.service.ApplyOrderService; +import com.lyms.platform.biz.service.DiagnosisService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; @@ -11,6 +12,7 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.AntExChuQuery; import com.lyms.platform.query.AntExQuery; +import com.lyms.platform.query.DiagnosisQuery; import com.lyms.platform.query.ReferralApplyOrderQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -19,7 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.concurrent.Callable; /** @@ -40,15 +44,18 @@ public class SieveWorker implements Callable> { private OrganizationService organizationService; + private DiagnosisService diagnosisService; + public SieveWorker(String hospitalId, List list, AntenatalExaminationService antService, PatientsService patientsService,ApplyOrderService applyOrderService, - OrganizationService organizationService) { + OrganizationService organizationService,DiagnosisService diagnosisService) { this.hospitalId = hospitalId; this.list = list; this.antService = antService; this.patientsService = patientsService; this.applyOrderService = applyOrderService; this.organizationService = organizationService; + this.diagnosisService = diagnosisService; } @Override @@ -123,6 +130,32 @@ public class SieveWorker implements Callable> { sieveListResult.setApplyHospital(organization.getName()); } + //查询产前诊断 + int a = 0; + List> mList = new ArrayList>(); + Map map = new HashMap(); + map.put("cqSieve","0");//0,未申请;1,已申请;2,已接收;3,已诊断 + map.put("diaProject",""); + map.put("diaResult","");//(0,阴性;1,阳性) + DiagnosisQuery diagnosisQuery = new DiagnosisQuery(); + diagnosisQuery.setParentId(sieveModel.getId()); + diagnosisQuery.setHospitalId(hospitalId); + List diaList = diagnosisService.queryDiagnosis(diagnosisQuery); + if(CollectionUtils.isNotEmpty(diaList)){ + for(DiagnosisModel diagnosisModel : diaList){ + Map m = new HashMap(); + map.put("cqSieve",diagnosisModel.getDiaStatus());//0,未申请;1,已申请;2,已接收;3,已诊断 + map.put("diaProject",diagnosisModel.getDiaProject()); + map.put("diaResult",diagnosisModel.getDiaResult());//(0,阴性;1,阳性) + a=1; + mList.add(m); + } + } + if(a == 0){ + mList.add(map); + } + sieveListResult.setDia(mList); + results.add(sieveListResult); } return results;