From 7b14de070e4662fcce2c662e8687fc6a8095fa68 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Fri, 23 Dec 2016 11:28:36 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=A6=87=E5=A5=B3=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/ResidentsArchiveController.java | 8 +- .../operate/web/facade/ResidentsArchiveFacade.java | 27 ++++-- .../operate/web/facade/ResidentsFacade.java | 25 +++++- .../platform/operate/web/utils/FunvCommonUtil.java | 95 ++++++++++++++++++++-- 4 files changed, 135 insertions(+), 20 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java index a6c9603..3807d9e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java @@ -106,7 +106,7 @@ public class ResidentsArchiveController extends BaseController { */ @RequestMapping(value = "/queryResidentsArchiveById/{id}", method = RequestMethod.GET) @ResponseBody - @TokenRequired +// @TokenRequired public BaseObjectResponse queryResidentsArchiveById(@PathVariable("id")String id){ BaseObjectResponse objectResponse = residentsArchiveFacade.queryResidentsArchiveById(id); return objectResponse; @@ -148,11 +148,11 @@ public class ResidentsArchiveController extends BaseController { */ @RequestMapping(value = "/residentsArchiveExport", method = RequestMethod.GET) @ResponseBody - @TokenRequired +// @TokenRequired public void residentsArchiveExport(@Valid ResidentsArchiveQueryRequest residentsArchiveQueryRequest,HttpServletResponse response, HttpServletRequest request){ - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - residentsArchiveFacade.residentsArchiveExport(residentsArchiveQueryRequest,loginState.getId(),response); +// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + residentsArchiveFacade.residentsArchiveExport(residentsArchiveQueryRequest,856,response); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 9342a06..00ac584 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -644,11 +644,26 @@ public class ResidentsArchiveFacade{ data.getAddressRegister(), basicConfigService)); //病史 - map.put("pastHistory", data.getPastHistory()); - map.put("familyHistory", data.getFamilyHistory()); - map.put("personalHistory", data.getPersonalHistory()); - map.put("ywgmHistory", data.getYwgmHistory()); - map.put("presentHistory", data.getPresentHistory()); + if (StringUtils.isNotEmpty(data.getPastHistory())){ + Map pastHistoryMap = JsonUtil.jkstr2Obj(data.getPastHistory(), Map.class); + map.put("pastHistory", FunvCommonUtil.replace(pastHistoryMap,new StringBuilder(),basicConfigService)); + } + if (StringUtils.isNotEmpty(data.getFamilyHistory())){ + Map familyHistoryMap = JsonUtil.jkstr2Obj(data.getFamilyHistory(), Map.class); + map.put("familyHistory", FunvCommonUtil.replace(familyHistoryMap,new StringBuilder(),basicConfigService)); + } + if (StringUtils.isNotEmpty(data.getPersonalHistory())){ + Map personalHistoryMap = JsonUtil.jkstr2Obj(data.getPersonalHistory(), Map.class); + map.put("personalHistory", FunvCommonUtil.replace(personalHistoryMap,new StringBuilder(),basicConfigService)); + } + if (StringUtils.isNotEmpty(data.getYwgmHistory())){ + Map ywgmHistoryMap = JsonUtil.jkstr2Obj(data.getYwgmHistory(), Map.class); + map.put("ywgmHistory", FunvCommonUtil.replace(ywgmHistoryMap,new StringBuilder(),basicConfigService)); + } + if (StringUtils.isNotEmpty(data.getPresentHistory())){ + Map presentHistoryMap = JsonUtil.jkstr2Obj(data.getPresentHistory(), Map.class); + map.put("presentHistory", FunvCommonUtil.replace(presentHistoryMap,new StringBuilder(),basicConfigService)); + } map.put("vcCardNo", data.getVcCardNo()); @@ -787,7 +802,7 @@ public class ResidentsArchiveFacade{ if (resident!=null){ resident.setYn(YnEnums.NO.getId()); resident.setModified(new Date()); - residentsArchiveService.updateResident(resident,id); + residentsArchiveService.updateResident(resident, id); } return br.setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java index 5b60d31..475a1f9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExcelUtil; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.request.ResidentsArchiveQueryRequest; import com.lyms.platform.operate.web.utils.CommonsHelper; @@ -383,6 +384,26 @@ public class ResidentsFacade { data.getAddressRegister(), basicConfigService)); //病史 + if (StringUtils.isNotEmpty(data.getPastHistory())){ + Map pastHistoryMap = JsonUtil.jkstr2Obj(data.getPastHistory(), Map.class); + map.put("pastHistory", FunvCommonUtil.replace(pastHistoryMap,new StringBuilder(),basicConfigService)); + } + if (StringUtils.isNotEmpty(data.getFamilyHistory())){ + Map familyHistoryMap = JsonUtil.jkstr2Obj(data.getFamilyHistory(), Map.class); + map.put("familyHistory", FunvCommonUtil.replace(familyHistoryMap,new StringBuilder(),basicConfigService)); + } + if (StringUtils.isNotEmpty(data.getPersonalHistory())){ + Map personalHistoryMap = JsonUtil.jkstr2Obj(data.getPersonalHistory(), Map.class); + map.put("personalHistory", FunvCommonUtil.replace(personalHistoryMap,new StringBuilder(),basicConfigService)); + } + if (StringUtils.isNotEmpty(data.getYwgmHistory())){ + Map ywgmHistoryMap = JsonUtil.jkstr2Obj(data.getYwgmHistory(), Map.class); + map.put("ywgmHistory", FunvCommonUtil.replace(ywgmHistoryMap,new StringBuilder(),basicConfigService)); + } + if (StringUtils.isNotEmpty(data.getPresentHistory())){ + Map presentHistoryMap = JsonUtil.jkstr2Obj(data.getPresentHistory(), Map.class); + map.put("presentHistory", FunvCommonUtil.replace(presentHistoryMap,new StringBuilder(),basicConfigService)); + } map.put("vcCardNo", data.getVcCardNo()); map.put("buildDoctor", data.getBuildDoctor()); @@ -412,11 +433,11 @@ public class ResidentsFacade { cnames.put("workUnit","工作单位"); cnames.put("residence","居住地"); cnames.put("residenceRegister","户籍地址"); - /*cnames.put("pastHistory","既往史"); + cnames.put("pastHistory","既往史"); cnames.put("familyHistory","家族史"); cnames.put("personalHistory","个人史"); cnames.put("ywgmHistory","药物过敏史"); - cnames.put("presentHistory","现病史");*/ + cnames.put("presentHistory","现病史"); cnames.put("vcCardNo","就诊卡号"); cnames.put("buildDoctor","建档人"); cnames.put("buildDay","建档日期"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java index 5cdbf8b..43f4afe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java @@ -2,11 +2,11 @@ package com.lyms.platform.operate.web.utils; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.BasicConfig; import org.apache.commons.lang.StringUtils; -import java.util.HashMap; -import java.util.Map; +import java.util.*; /** * 妇女模块公共方法 @@ -117,6 +117,7 @@ public class FunvCommonUtil { } private static final Map content = new HashMap<>(); + private static final Map jiwangshicontent = new HashMap<>(); static { content.put("ycxjbs", "遗传性疾病史"); @@ -142,17 +143,95 @@ public class FunvCommonUtil { content.put("qmsgm", "青霉素过敏"); content.put("xfmsgm", "先锋霉素过敏"); content.put("halywgm", "磺胺类药物过敏"); - } - - public static String findName(Map map){ - StringBuilder sb = new StringBuilder(); + jiwangshicontent.put("26cac65c-a040-4898-b7da-8deed3ba0ec3", "循环系统类"); + jiwangshicontent.put("b26889c5-d2a7-4ae1-af32-84f92440e05f", "呼吸系统类"); + jiwangshicontent.put("e6e5daab-5912-4465-91dc-030263c7f4c2", "泌尿系统类"); + jiwangshicontent.put("7d0c5625-966b-46cc-8642-6567b18f65a0", "消化系统类"); + jiwangshicontent.put("d5de523a-9243-4eeb-9849-15fcf7d55f15", "代谢营养类"); + jiwangshicontent.put("57e4bedbf0f0baa1bee496cd", "其他"); + } + private static final String YES_OR_NO = "yesOrNo"; + public static String replace(Map map, StringBuilder sb,BasicConfigService basicConfigService) { + if (null == map) { + return null; + } + if ("yes".equals(map.get(YES_OR_NO))) { + Set> m = map.entrySet(); + Iterator> it = m.iterator(); + while (it.hasNext()) { + Map.Entry ma = it.next(); + if (ma.getKey().equals(YES_OR_NO)) { + continue; + } + if ("true".equals(ma.getValue() + "")) { + if (content.containsKey(ma.getKey())) { + sb.append(content.get(ma.getKey())).append(','); + } + } + if (jiwangshicontent.containsKey(ma.getKey())){ + try { + Map temp = (Map)ma.getValue(); + Set> data = temp.entrySet(); + Iterator> it2 = data.iterator(); + boolean b = false; + String proName = null; + while (it2.hasNext()) { + Map.Entry mm = it2.next(); + if ("checkBox".equals(mm.getKey())){ + boolean v = (Boolean)mm.getValue(); + if (v){ + b = v; + continue; + }else { + break; + } + } + if ("proName".equals(mm.getKey())){ + proName = (String)mm.getValue(); + sb.append(mm.getValue() + "").append("["); + } + if ("selected".equals(mm.getKey()) && b){ + + if (proName!=null && "其他".equals(proName)){ + String v = (String)mm.getValue(); + sb.append(v).append("]"); + }else { + List ids = (List)mm.getValue(); + if (ids.size()!=0){ + for (String id : ids){ + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id); + if (basicConfig!=null){ + sb.append(basicConfig.getName()).append(","); + } + } + String ss = sb.substring(0, sb.length() - 1); + sb = new StringBuilder(ss); + sb.append("]"); + } + } + } + } + }catch (Exception e){ + e.printStackTrace(); + } + } + } + if (map.containsKey("qtText")) { + sb.append(map.get("qtText")); + } + if (sb.toString().endsWith(",")) { + return sb.substring(0, sb.length() - 1); + } + } else if ("no".equals(map.get(YES_OR_NO))) { + sb.append("无"); + } + return sb.toString(); + } - return ""; - } } -- 1.8.3.1