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 c50b0ff..3acff27 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 @@ -21,16 +21,16 @@ import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.worker.SieveWorker; 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.*; import com.lyms.platform.query.*; -/*import javafx.beans.binding.ObjectExpression;*/ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.data.domain.Sort; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.stereotype.Component; @@ -61,6 +61,9 @@ public class SieveFacade { private PatientsService patientsService; @Autowired + private UsersService usersService; + + @Autowired private OrganizationGroupsFacade groupsFacade; @Autowired @@ -243,7 +246,7 @@ public class SieveFacade { } - public String getSieveStatus(String patientId,String hospitalId) + public String getSieveStatus(String patientId,String hospitalId) { String siveStatus = ""; @@ -394,12 +397,9 @@ public class SieveFacade { sieveQuery.setNeed(needPage); String hospitalId = autoMatchFacade.getHospitalId(userId); sieveQuery.setHospitalId(hospitalId); - // System.out.println("产筛列表："+sieveQuery.convertToQuery().convertToMongoQuery()); //查询产筛list List list = sieveService.queryList1(sieveQuery, "order"); List data = new ArrayList<>(); - - int batchSize = 4; int end = 0; List listFuture = new ArrayList<>(); @@ -408,7 +408,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))); + listFuture.add(commonThreadPool.submit(new SieveWorker(hospitalId, list.subList(i, end), antenatalExaminationService, patientsService,applyOrderService,organizationService))); } for (Future f : listFuture) { try { @@ -417,49 +417,6 @@ public class SieveFacade { ExceptionUtils.catchException(e, "cqSieve list get result Future error."); } } - - - -/* - if (CollectionUtils.isNotEmpty(list)) { - for (SieveModel sieveModel : list) { - SieveListResult sieveListResult = new SieveListResult(); - AntExQuery antExQuery = new AntExQuery(); - antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setHospitalId(hospitalId); - antExQuery.setParentId(sieveModel.getParentId()); - List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created")); - if (CollectionUtils.isNotEmpty(list1)) { - if (StringUtils.isNotEmpty(list1.get(0).getTireNumber())) { - sieveModel.setTireNumber(NumberUtils.toInt(list1.get(0).getTireNumber())); - } - } else { - AntExChuQuery antExChuQuery = new AntExChuQuery(); - antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setParentId(sieveModel.getParentId()); - antExChuQuery.setHospitalId(hospitalId); - List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); - if (CollectionUtils.isNotEmpty(antExChuModels)) { - if (StringUtils.isNotEmpty(antExChuModels.get(0).getTireNumber())) { - sieveModel.setTireNumber(NumberUtils.toInt(antExChuModels.get(0).getTireNumber())); - } - } - } - - sieveListResult.convertToResult(sieveModel); - Patients patients = patientsService.findOnePatientById(sieveModel.getParentId()); - if (null != patients) { - sieveListResult.setIsGravida((patients.getType() == 3 && patients.getFmDate() != null) ? "0" : "1"); - if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) - sieveListResult.setcDueWeek("终止妊娠"); - else if (patients.getType() == 3) { - sieveListResult.setcDueWeek("已分娩"); - } - sieveListResult.setAge(DateUtil.getAge(patients.getBirth()) + "岁"); - } - data.add(sieveListResult); - } - }*/ return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(sieveQuery.getPageInfo()); } @@ -598,7 +555,7 @@ public class SieveFacade { Patients pat = null; if (CollectionUtils.isNotEmpty(localPatients)) { - pat = localPatients.get(0); + pat = localPatients.get(0); } else { @@ -641,7 +598,7 @@ public class SieveFacade { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(patientBaseResult); } - public BaseResponse getSieveApplyInfo(String parentId, Integer userId) { + public BaseResponse getSieveApplyInfo(String parentId, Integer userId,Integer type) { Map map = new HashMap<>(); String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -684,7 +641,7 @@ public class SieveFacade { patientBaseResult.setRiskFactor(highScoreResult.getHighRisk()); patientBaseResult.setRiskScore(highScoreResult.getScoreStr()); - map.put("patientInfo",patientBaseResult); + map.put("patientInfo", patientBaseResult); SieveApplyOrderQuery sieveApplyOrderQuery1 = new SieveApplyOrderQuery(); sieveApplyOrderQuery1.setParentId(parentId); @@ -697,12 +654,14 @@ public class SieveFacade { if (CollectionUtils.isNotEmpty(sieveApplyOrderModels)) { Map result = new HashMap<>(); + + Map viewInfo = new HashMap<>(); SieveApplyOrderModel sieveApply = sieveApplyOrderModels.get(0); result.put("id",sieveApply.getId()); result.put("parentId",sieveApply.getParentId()); - result.put("checkItem",sieveApply.getCheckItem()); + result.put("check",sieveApply.getCheckItem()); result.put("guide",sieveApply.getGuide()); result.put("checkDate",sieveApply.getCheckDate()); result.put("applyDoctor",sieveApply.getApplyDoctor()); @@ -715,16 +674,89 @@ public class SieveFacade { result.put("collectionDoctorId",sieveApply.getCollectionDoctorId()); result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate())); result.put("crl",sieveApply.getCrl()); + result.put("bpd",sieveApply.getBpd()); result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate())); result.put("historyBirth",sieveApply.getHistoryBirth()); result.put("pastHistory",sieveApply.getPastHistory()); result.put("applyHospitalId",sieveApply.getApplyHospitalId()); result.put("sendDoctor",sieveApply.getSendDoctor()); result.put("sendTime",DateUtil.getyyyy_MM_dd(sieveApply.getSendTime())); + result.put("age",DateUtil.getAge(sieveApply.getBirth(), sieveApply.getCreated())); + result.put("mensesDay",sieveApply.getMensesDay()); + result.put("mensesWeek",sieveApply.getMensesWeek()); + result.put("experimentNum",""); map.put("sieveApplyInfo",result); + if (type == 1) + { + if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getApplyDoctor())) { + Users users = usersService.getUsers(Integer.parseInt(sieveApply.getApplyDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + viewInfo.put("applyDoctorName",users.getName()); + } + } + + if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getCollectionDoctorId())) { + Users users = usersService.getUsers(Integer.parseInt(sieveApply.getCollectionDoctorId())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + viewInfo.put("collectionDoctorName",users.getName()); + } + } + + if (com.lyms.platform.common.utils.StringUtils.isNum(sieveApply.getSendDoctor())) { + Users users = usersService.getUsers(Integer.parseInt(sieveApply.getSendDoctor())); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + viewInfo.put("sendDoctorName",users.getName()); + } + } + if (null != sieveApply.getApplyHospitalId()) { + Organization org = organizationService.getOrganization(Integer.valueOf(sieveApply.getApplyHospitalId())); + if (null != org) { + viewInfo.put("applyHospitalName", org.getName()); + } + } + String isTire = ""; + String tireNumber = ""; + + AntExChuQuery antExChuQuery1 = new AntExChuQuery(); + antExChuQuery1.setParentId(parentId); + antExChuQuery1.setYn(YnEnums.YES.getId()); + List data1 = antenatalExaminationService.queryAntExChu(antExChuQuery1); + if (CollectionUtils.isNotEmpty(data1)) + { + AntExChuModel chuModel = data1.get(0); + if (StringUtils.isNotEmpty(chuModel.getTireNumber())) + { + isTire = Integer.parseInt(chuModel.getTireNumber()) > 1 ? "是":"否"; + tireNumber = chuModel.getTireNumber(); + } + } + + map.put("isTire",isTire); + map.put("tireNumber",tireNumber); + + map.put("viewInfo",viewInfo); + } + else if (type == 3) + { + Map sieveInfo = new HashMap<>(); + + + map.put("sieveInfo",sieveInfo); + } + } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(map); } + + public BaseResponse reviceSieve(String parentId, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + SieveModel sieve = new SieveModel(); + sieve.setParentId(parentId); + sieve.setHospitalId(hospitalId); + sieve.setReviceStatus(2); + sieveService.updateOneChanQianDiaSieve(sieve); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } } \ No newline at end of file