diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java index d9cfac9..fb248ed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java @@ -54,11 +54,11 @@ public class ViewController extends BaseController { * @return */ @RequestMapping(value = "/downExChuData", method = RequestMethod.GET) - // @TokenRequired + @TokenRequired public void downExChuData(@RequestParam("id") String id, HttpServletRequest request, HttpServletResponse response) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Map map = viewFacade.exChuData(id,loginState.getId()); + Map map = viewFacade.exChuData(id, loginState.getId()); if (map == null) { return; @@ -116,41 +116,46 @@ public class ViewController extends BaseController { markPubText(builder, "/"); } - if(data.containsKey("heart")){ + if (data.containsKey("heart")) { builder.moveToBookmark("heart"); - markFrameText(builder, (String)data.get("heart")); + markFrameText(builder, (String) data.get("heart")); data.remove("heart"); } - if(data.containsKey("lungs")){ + if (data.containsKey("lungs")) { builder.moveToBookmark("lungs"); - markFrameText(builder, (String)data.get("lungs")); + markFrameText(builder, (String) data.get("lungs")); data.remove("lungs"); } - if(data.containsKey("vulva")){ + if (data.containsKey("vulva")) { builder.moveToBookmark("vulva"); - markFrameText(builder, (String)data.get("vulva")); + markFrameText(builder, (String) data.get("vulva")); data.remove("vulva"); } - if(data.containsKey("vagina")){ + if (data.containsKey("vagina")) { builder.moveToBookmark("vagina"); - markFrameText(builder, (String)data.get("vagina")); + markFrameText(builder, (String) data.get("vagina")); data.remove("vagina"); } - if(data.containsKey("cervical")){ + if (data.containsKey("cervical")) { builder.moveToBookmark("cervical"); - markFrameText(builder, (String)data.get("cervical")); + markFrameText(builder, (String) data.get("cervical")); data.remove("cervical"); } - if(data.containsKey("uterus")){ + if (data.containsKey("uterus")) { builder.moveToBookmark("uterus"); - markFrameText(builder, (String)data.get("uterus")); + markFrameText(builder, (String) data.get("uterus")); data.remove("uterus"); } - if(data.containsKey("fujian")){ + if (data.containsKey("fujian")) { builder.moveToBookmark("fujian"); - markFrameText(builder, (String)data.get("fujian")); + markFrameText(builder, (String) data.get("fujian")); data.remove("fujian"); } + if (data.containsKey("isZhuan")) { + builder.moveToBookmark("isZhuan"); + markFrameText(builder, (String) data.get("isZhuan")); + data.remove("isZhuan"); + } builder.moveToBookmark("ydfmw"); List ydfmw = (List) data.get("ydfmw"); data.remove("ydfmw"); @@ -158,19 +163,19 @@ public class ViewController extends BaseController { markFrameText(builder, yf); markPubText(builder, "/"); } - if(data.containsKey("ydqjd")){ + if (data.containsKey("ydqjd")) { builder.moveToBookmark("ydqjd"); - markFrameText(builder, (String)data.get("ydqjd")); + markFrameText(builder, (String) data.get("ydqjd")); data.remove("ydqjd"); } - if(data.containsKey("syjg")){ + if (data.containsKey("syjg")) { builder.moveToBookmark("syjg"); - markFrameText(builder, (String)data.get("syjg")); + markFrameText(builder, (String) data.get("syjg")); data.remove("syjg"); } - if(data.containsKey("hivkt")){ + if (data.containsKey("hivkt")) { builder.moveToBookmark("hivkt"); - markFrameText(builder, (String)data.get("hivkt")); + markFrameText(builder, (String) data.get("hivkt")); data.remove("hivkt"); } } catch (Exception e) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index fc9bf6f..8a9885f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -174,7 +174,6 @@ public class BasicConfigFacade { br.setWeight(data.getWeight()); configResults.add(br); } - } return configResults; } 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 19883ff..98908bb 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 @@ -24,6 +24,7 @@ import com.lyms.platform.query.*; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -282,19 +283,6 @@ public class ViewFacade { return null; } - String hospital = autoMatchFacade.getHospitalId(userId); - - ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); - referralApplyOrderQuery.setParentId(data.getParentId()); - referralApplyOrderQuery.setOutHospitalId(hospital); - List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); - if(CollectionUtils.isNotEmpty(orderModels)){ - ReferralApplyOrderModel referralApplyOrderModel = orderModels.get(0); - //转院必要性 - String tranDise = referralApplyOrderModel.getTransferredDisease(); - - } - Map map = new HashMap<>(); /* 基本信息 */ //孕妇基本信息 @@ -714,6 +702,30 @@ public class ViewFacade { map.put("bChao", data.getbChao()); } + + String hospital = autoMatchFacade.getHospitalId(userId); + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(data.getParentId()); + 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"); + } + } catch (Exception e) { + + } + } + }else{ + map.put("isZhuan","1"); + } + + if (data.getNextCheckTime() != null) { Calendar nextCheck = Calendar.getInstance(); nextCheck.setTime(data.getNextCheckTime());