diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java index ffc1251..300cf4e 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ReferralApplyOrderDaoImpl.java @@ -33,6 +33,6 @@ public class ReferralApplyOrderDaoImpl extends BaseMongoDAOImpl orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + if (CollectionUtils.isNotEmpty(orderModelList)) { + String outHospitalId = orderModelList.get(0).getOutHospitalId(); + ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); + referralApplyOrderQuery1.setOutHospitalId(outHospitalId); + referralApplyOrderQuery1.setTransferredHospital(hospital); + referralApplyOrderQuery1.setPid(patients.getPid()); + + ReferralApplyOrderModel model = new ReferralApplyOrderModel(); + //设置接收时间 + model.setReceived(new Date()); + model.setRecDoctor(userId + ""); + applyOrderService.updateByParentId(referralApplyOrderQuery1, model); + } + } } else { List list1 = autoMatchFacade.matchOrgId(userId); Patients patients = patientsService.findOnePatientById(excAddRequest.getParentId()); @@ -303,7 +324,7 @@ public class AntenatalExaminationFacade { max = listDate.get(0).getDate(); } - HighScoreResult highScoreResult = getPatLastRiskByDate(pid, needLevel,min, max); + HighScoreResult highScoreResult = getPatLastRiskByDate(pid, needLevel, min, max); return highScoreResult; } @@ -315,13 +336,13 @@ public class AntenatalExaminationFacade { * @param date * @return */ - public HighScoreResult getPatLastRiskByDate(String pid, boolean needLevel, Date min,Date date) { + public HighScoreResult getPatLastRiskByDate(String pid, boolean needLevel, Date min, Date date) { AntExQuery antExQuery = new AntExQuery(); antExQuery.setPid(pid); antExQuery.setYn(YnEnums.YES.getId()); if (min != null) { antExQuery.setStart(min); - }else if(null!=date){ + } else if (null != date) { antExQuery.setEnd(date); } List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "modified")); @@ -348,17 +369,17 @@ public class AntenatalExaminationFacade { if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) { map1.put("name", map.get("fxysu")); - Object idObj1 = map.get("fyyse"); - if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); - if (null != basicConfig) { - String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + Object idObj1 = map.get("fyyse"); + if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); + if (null != basicConfig) { + String name = basicConfig.getName(); + if (name.indexOf("预警") > -1) { + name = name.replace("预警", ""); } + map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); } + } highScoreResult.getHighRisk().add(map1); } else { continue; @@ -424,17 +445,17 @@ public class AntenatalExaminationFacade { Object obj = map.get("fxysu"); if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) { map1.put("name", map.get("fxysu")); - Object idObj1 = map.get("fyyse"); - if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); - if (null != basicConfig) { - String name = basicConfig.getName(); - if (name.indexOf("预警") > -1) { - name = name.replace("预警", ""); - } - map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); + Object idObj1 = map.get("fyyse"); + if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString()); + if (null != basicConfig) { + String name = basicConfig.getName(); + if (name.indexOf("预警") > -1) { + name = name.replace("预警", ""); } + map1.put("color", "risk_" + RiskDefaultTypeEnum.getColor(name)); } + } highScoreResult.getHighRisk().add(map1); } else { continue; @@ -475,7 +496,7 @@ public class AntenatalExaminationFacade { * @param exListQueryRequest * @return */ - public BaseResponse findAntExListTwo(AntExListQueryRequest exListQueryRequest,Integer userId) { + public BaseResponse findAntExListTwo(AntExListQueryRequest exListQueryRequest, Integer userId) { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setCardNo(exListQueryRequest.getCardNo()); patientsQuery.setYn(YnEnums.YES.getId()); @@ -487,11 +508,11 @@ public class AntenatalExaminationFacade { Map map = new HashMap(); List sortList = new ArrayList(); - String hospital=autoMatchFacade.getHospitalId(userId); + String hospital = autoMatchFacade.getHospitalId(userId); List listDate = new ArrayList(); if (CollectionUtils.isNotEmpty(list)) { - Patients patients2= findOnePatient(null,null,null,hospital,-1,false,exListQueryRequest.getPid()); + Patients patients2 = findOnePatient(null, null, null, hospital, -1, false, exListQueryRequest.getPid()); antexListResult.convertToResult(null, patients2, null); HighScoreResult highScoreResult = findLastRisk(list.get(0).getPid(), false); @@ -1006,7 +1027,7 @@ public class AntenatalExaminationFacade { * @param type 类型 1 孕妇 3 产妇 -1 不区分 * @param outHospital 是否需要查外院 */ - public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type, boolean outHospital,String pid) { + public Patients findOnePatient(String cardNo, String vcCardNo, String id, String hospitalId, Integer type, boolean outHospital, String pid) { PatientsQuery patientsQuery = new PatientsQuery(); if (StringUtils.isNotEmpty(cardNo)) { patientsQuery.setCardNo(cardNo); @@ -1014,7 +1035,7 @@ public class AntenatalExaminationFacade { patientsQuery.setVcCardNo(vcCardNo); } else if (StringUtils.isNotEmpty(id)) { patientsQuery.setId(id); - }else if(StringUtils.isNotEmpty(pid)){ + } else if (StringUtils.isNotEmpty(pid)) { patientsQuery.setPid(pid); } patientsQuery.setType(type); @@ -1088,7 +1109,7 @@ public class AntenatalExaminationFacade { hospital = list1.get(0) + ""; } //查询产妇数据 - patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1, false,null); + patients = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, hospital, 1, false, null); } if (null == patients) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index d2ff114..35256f7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -125,7 +125,6 @@ public class ApplyOrderFacade { referralApplyOrderModel.setServiceType(patients.getServiceType()); id=patients.getId(); if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) { - PatientsQuery patientsQuery1 = new PatientsQuery(); patientsQuery1.setPid(patients.getPid()); patientsQuery1.setYn(YnEnums.YES.getId()); @@ -143,6 +142,9 @@ public class ApplyOrderFacade { patients.setExpVip(0); id=patientsService.addPatient(patients).getId(); } + }else{ + patients.setBuildType(3); + patientsService.updatePatient(patients); } } } else { @@ -186,6 +188,9 @@ public class ApplyOrderFacade { babyModel.setBuildType(3); id =babyService.addOneBaby(babyModel).getId(); } + }else { + babyModel.setBuildType(3); + babyService.updateOneBaby(babyModel,babyModel.getId()); } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 49a69d9..c22b76c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Component; +import java.time.YearMonth; import java.util.*; @Component @@ -42,7 +43,7 @@ public class BabyCheckFacade { private PatientsService patientsService; @Autowired - private AntenatalExaminationService antenatalExaminationService; + private ApplyOrderService applyOrderService; @Autowired private UsersService usersService; @@ -185,7 +186,7 @@ public class BabyCheckFacade { * @param request * @return */ - public BaseResponse addBabyCheck(BabyCheckRequest request) { + public BaseResponse addBabyCheck(BabyCheckRequest request,Integer userId) { //儿童体检后 更新下次预约时间和是否高危 在基础数据表里面 BabyModel bm = new BabyModel(); @@ -215,6 +216,31 @@ public class BabyCheckFacade { br.setErrormsg("失败"); } + BabyModelQuery babyModelQuery=new BabyModelQuery(); + babyModelQuery.setId(request.getBuildId()); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setBuildType(3); + List babyModelList= babyBookbuildingService.queryBabyBuildByCond(babyModelQuery); + if(CollectionUtils.isNotEmpty(babyModelList)){ + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(request.getBuildId()); + String hospital =babyModelList.get(0).getHospitalId(); + referralApplyOrderQuery.setHospitalId(hospital); + List orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + if (CollectionUtils.isNotEmpty(orderModelList)) { + String outHospitalId = orderModelList.get(0).getOutHospitalId(); + ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); + referralApplyOrderQuery1.setOutHospitalId(outHospitalId); + referralApplyOrderQuery1.setTransferredHospital(hospital); + referralApplyOrderQuery1.setPid(babyModelList.get(0).getPid()); + + ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); + //设置接收时间 + model1.setReceived(new Date()); + model1.setRecDoctor(userId + ""); + applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); + } + } br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功"); br.setData(model.getId());