diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index c6618dd..7369b73 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -258,7 +258,7 @@ public class ViewFacade { * @param num 当前位置 * @return */ - public Map exFuData(String id, int num,Integer userId) { + public Map exFuData(String id, int num, Integer userId) { Map map = new HashedMap(); AntenatalExaminationModel[] exData = new AntenatalExaminationModel[4]; AntenatalExaminationModel antenatalExaminationModel = antExService.findOneById(id); @@ -358,11 +358,10 @@ public class ViewFacade { referralApplyOrderQuery.setParentId(data.getParentId()); referralApplyOrderQuery.setOutHospitalId(hospital); List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); - if (CollectionUtils.isNotEmpty(orderModels)) - { + if (CollectionUtils.isNotEmpty(orderModels)) { boolean isZhuan = false; - for(ReferralApplyOrderModel raom:orderModels){//获取转院时间 - if(raom.getCreated().before(data.getCheckDate())){ + for (ReferralApplyOrderModel raom : orderModels) {//获取转院时间 + if (raom.getCreated().before(data.getCheckDate())) { isZhuan = true; continue; } @@ -378,8 +377,7 @@ public class ViewFacade { } } - } else - { + } else { map.put(numStr + "isZhuan", "1"); } @@ -505,8 +503,7 @@ public class ViewFacade { map.put("mDay", String.valueOf(mDay)); } - if (patients.getDueDate() != null) - { + if (patients.getDueDate() != null) { Calendar dueCal = Calendar.getInstance(); dueCal.setTime(patients.getDueDate()); int yYear = dueCal.get(Calendar.YEAR); @@ -608,24 +605,19 @@ public class ViewFacade { } List grs = new ArrayList<>(); - if (personalHistory.contains("吸烟")) - {//1吸烟 + if (personalHistory.contains("吸烟")) {//1吸烟 grs.add("1"); } - if (personalHistory.contains("饮酒")) - {//2饮酒 + if (personalHistory.contains("饮酒")) {//2饮酒 grs.add("2"); } - if (personalHistory.contains("服用药物")) - {//3服用药物 + if (personalHistory.contains("服用药物")) {//3服用药物 grs.add("3"); } - if (personalHistory.contains("接触有毒有害物质")) - {//4接触有毒有害物质 + if (personalHistory.contains("接触有毒有害物质")) {//4接触有毒有害物质 grs.add("4"); } - if (personalHistory.contains("接触放射线")) - {//5接触放射线 + if (personalHistory.contains("接触放射线")) {//5接触放射线 grs.add("5"); } @@ -1025,23 +1017,30 @@ public class ViewFacade { referralApplyOrderQuery.setOutHospitalId(hospital); List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isNotEmpty(orderModels)) { - //转院必要性 - if (NumberUtils.isNumber(hospital)) { - try { - Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(hospital)); - if (null != zhuanc1) { - map.put("zhuancl", zhuanc1.getName()); - map.put("isZhuan", "2"); + boolean isZhuan = false; + for (ReferralApplyOrderModel raom : orderModels) {//获取转院时间 + if (raom.getCreated().before(data.getCheckTime())) { + isZhuan = true; + continue; + } + } + if (isZhuan) { + if (NumberUtils.isNumber(hospital)) { + try { + Organization zhuanc1 = organizationService.getOrganization(Integer.valueOf(hospital)); + if (null != zhuanc1) { + map.put("zhuancl", zhuanc1.getName()); + map.put("isZhuan", "2"); + } + } catch (Exception e) { + e.printStackTrace(); } - } catch (Exception e) { - } + } else { + map.put("isZhuan", "1"); } - } else - - { - map.put("isZhuan", "1"); } + if (data.getNextCheckTime() != null) { Calendar nextCheck = Calendar.getInstance(); nextCheck.setTime(data.getNextCheckTime());