From 435a082745ccbcce278fad65b7431bdea70bbb13 Mon Sep 17 00:00:00 2001 From: wangxh Date: Thu, 30 Apr 2020 15:56:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B8=B8=E7=94=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=97=85=E6=A1=88=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8F=8A=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commomSearch/CommomSearchController.java | 46 +++++++- src/main/java/com/emr/dao/CommomMapper.java | 2 + src/main/java/com/emr/dao/Zd_Cm3Mapper.java | 2 + src/main/resources/mapper/CommomMapper.xml | 8 ++ .../commomSearch/commomListqf.jsp | 103 +++++++++++++++++- src/main/webapp/static/js/commom.js | 5 +- src/main/webapp/static/js/dateUtil.js | 3 +- .../recordManage/commomSearch/commomList.js | 1 + .../recordManage/commomSearch/commomListqf.js | 63 +++++++++-- .../templateSearch/searchCommomMethodqf.js | 63 ++++++++++- 10 files changed, 278 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java index cd89d7b..b42dc3a 100644 --- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java +++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java @@ -214,6 +214,19 @@ public class CommomSearchController { } } + /** + * 根据公共表id查询公共表信息 + * @param patientId + * @return + */ + @RequestMapping("getCommomInfoById") + @ResponseBody + public String getCommomInfoById(String patientId){ + CommomVo commomVo = commomMapper.selectByPrimaryKey(patientId); + return JSON.toJSONString(commomVo); + } + + /** * 加载公共表信息 * @@ -493,6 +506,29 @@ public class CommomSearchController { return JSON.toJSONString(zdAssorts); } + @RequiresPermissions("/commom/updateCommomInfo") + @OptionalLog(module = "保存",methods = "病案信息修改") + @RequestMapping("updateCommomInfo") + @ResponseBody + public ResultUtil updateCommomInfo(CommomVo commomVo){ + if (null != commomVo.getInpatientNo()){ + int vo = commomMapper.selectCountByPatients(commomVo.getPatientId()); + if (vo > 0){ + int i = commomMapper.updateByPrimaryKeySelective(commomVo); + if (i > 0){ + return ResultUtil.ok(); + } else { + return ResultUtil.error("修改失败!"); + } + } else { + return ResultUtil.error("修改失败,该病案主键不存在!"); + } + } else { + return ResultUtil.error("修改失败,主键不能为空!"); + } + } + + //脐血库 //获取病案图片根路径 @RequestMapping("getFilePath") @@ -1333,10 +1369,10 @@ public class CommomSearchController { } } - /* */ - /** - * @MethodName: getOperateCodeContents + + /**getOperateCodeContents + * @MethodName: * @Description: 根据手术编码查询手术对象集合 * @Param * @Return @@ -1399,6 +1435,9 @@ public class CommomSearchController { } } + + + /** * @MethodName: getCodeTypeTree * @Description: 根据patientId加载类别树 @@ -2246,4 +2285,5 @@ public class CommomSearchController { return ResultUtil.error("上传出错了,请联系系统管理员!"); } } + } diff --git a/src/main/java/com/emr/dao/CommomMapper.java b/src/main/java/com/emr/dao/CommomMapper.java index 2ecae19..1e30660 100644 --- a/src/main/java/com/emr/dao/CommomMapper.java +++ b/src/main/java/com/emr/dao/CommomMapper.java @@ -100,4 +100,6 @@ public interface CommomMapper { * @return */ int selectCommomCount(); + + int selectCountByPatients(String inpatientNo); } \ No newline at end of file diff --git a/src/main/java/com/emr/dao/Zd_Cm3Mapper.java b/src/main/java/com/emr/dao/Zd_Cm3Mapper.java index 7d12a87..8d0f50e 100644 --- a/src/main/java/com/emr/dao/Zd_Cm3Mapper.java +++ b/src/main/java/com/emr/dao/Zd_Cm3Mapper.java @@ -11,4 +11,6 @@ public interface Zd_Cm3Mapper { int insertSelective(Zd_Cm3 record); List selectAll(@Param("code")String code,@Param("name")String name); + + } \ No newline at end of file diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml index ed8940a..1089acb 100644 --- a/src/main/resources/mapper/CommomMapper.xml +++ b/src/main/resources/mapper/CommomMapper.xml @@ -96,6 +96,14 @@ + + + - + + @@ -665,6 +668,103 @@ + + + diff --git a/src/main/webapp/static/js/commom.js b/src/main/webapp/static/js/commom.js index 941b3c4..ae65406 100644 --- a/src/main/webapp/static/js/commom.js +++ b/src/main/webapp/static/js/commom.js @@ -24,4 +24,7 @@ function appendSelect(selectId,data,allFlag){ } $("#"+selectId).append(html); } -} \ No newline at end of file +} + + + diff --git a/src/main/webapp/static/js/dateUtil.js b/src/main/webapp/static/js/dateUtil.js index 3e5e91f..f73b147 100644 --- a/src/main/webapp/static/js/dateUtil.js +++ b/src/main/webapp/static/js/dateUtil.js @@ -81,6 +81,5 @@ function pickTime(info){ }) } -function getDefaultNumAndMaxNum() { -} + diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomList.js b/src/main/webapp/static/js/recordManage/commomSearch/commomList.js index 23c1ea3..325d5fa 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/commomList.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/commomList.js @@ -63,6 +63,7 @@ function loadDept(){ }) } + //加载转归情况 function loadDiagStatus(){ $.ajax({ diff --git a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js index 07ee28f..052c74b 100644 --- a/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js +++ b/src/main/webapp/static/js/recordManage/commomSearch/commomListqf.js @@ -120,6 +120,43 @@ function loadDept() { }) } +//加载科室 +function loadDeptDefault(defaultDeptName){ + $.ajax({ + type:'get', + url:path+'/commom/getDept', + dataType:'json', + success:function (data) { + if(null != data){ + $("#disDept").empty(); + var html = ''; + /*for (var i = 0; i < data.length; i++) { + if(data[i].name != '' && data[i].name == defaultDeptName){ + html += ''; + } else { + html += ''; + } + }*/ + for (var i = 0; i < data.length; i++) { + if (data[i].name != '' && data[i].name == defaultDeptName) { + var name = data[i].name; + var py = makePy(name); + var pingyin = ConvertPinyin(name); + html += ''; + } else { + var name = data[i].name; + var py = makePy(name); + var pingyin = ConvertPinyin(name); + html += ''; + } + } + $("#disDept").append(html); + $("#disDept").selectpicker('refresh'); + } + } + }) +} + //加载转归情况 function loadDiagStatus() { $.ajax({ @@ -633,9 +670,9 @@ function getDiagNameContents(id) { } } } else { - clearContent(id); return; } + clearContent('main_diag_name') } //级联手术编码 @@ -690,22 +727,25 @@ function insertContent(content, id) { setLocation(id); var json = JSON.parse(content); for (key in json) { - console.log(key) - console.log(json[key]) var tr = document.createElement("tr"); + var td1 = document.createElement("td"); var td2 = document.createElement("td"); var td4 = document.createElement("td"); tr.setAttribute("bgcolor", "#FFFAFA"); tr.setAttribute("border", "0"); - if (id == 'inpatient_no' || id == 'diag_code' || id == 'operate_code') { - td2.innerHTML = key; - td4.innerHTML = json[key]; + if (id == 'main_diag_name'){ + td1.innerHTML = json[key]; + tr.appendChild(td1); } else { - td2.innerHTML = json[key]; - td4.innerHTML = key; + if (id == 'inpatient_no' || id == 'diag_code' || id == 'operate_code') { + td2.innerHTML = key; + } else { + td2.innerHTML = json[key]; + td4.innerHTML = key; + } + tr.appendChild(td2); + tr.appendChild(td4); } - tr.appendChild(td2); - tr.appendChild(td4); document.getElementById(id + "Content").appendChild(tr); tr.onmouseover = function () { this.className = 'mouseOver'; @@ -714,6 +754,9 @@ function insertContent(content, id) { tr.onmouseout = function () { this.className = 'mouseOut'; }; + tr.onclick = function () { + clearContent(id); + } } } diff --git a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js index 9a9a4b0..06dd8c1 100644 --- a/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js +++ b/src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js @@ -72,6 +72,15 @@ $(document).keydown(function (event) { } }); function freshTable(){ + var powerMenus = $("#powerMenus").val().substring(1,$("#powerMenus").val().length-1); + var powerMenusArr = powerMenus.split(", "); + for (var i = 0; i < powerMenusArr.length; i++){ + var strs = powerMenusArr[i]; + if (strs == '/commom/updateCommomInfo') { + $("#powerMenu").val("true"); + } + } + var str = $("#powerMenu").val(); $("#mytab").bootstrapTable('destroy'); $("#checks").val(''); var columns = []; @@ -334,6 +343,8 @@ function reLoadTable(){ //列表行‘操作’按钮 function AddFunctionAlty(value, row, index) { var patientId = "'" + row.patientId + "'"; + var updatePower = $("#powerMenu").val(); + var userId = $("#userId").val(); //是否可查看 var isShowDetail = row.isShowDetail; var lockStatus = row.lockStatus; @@ -344,8 +355,11 @@ function AddFunctionAlty(value, row, index) { var isDownload = row.isDownload; var str = ''; if(lockStatus != '' && lockStatus == 1 && unlockOper == 1){ - str += ''; + str += ''; }else{ + if (userId == 1 || updatePower == 'true'){ + str += ''; + } if((null != isShowDetail && isShowDetail == 1) || showRecord == "1"){ str += '查看详情'; }else{ @@ -379,6 +393,53 @@ function clearForm(){ $("#dis_dept").selectpicker("refresh"); } +/** + * 获取修改的病案信息 + * @param patientId + */ +function getUpdateCommomInfo(patientId) { + $.ajax({ + type:'get', + url:path+'/commom/getCommomInfoById', + data:{patientId:patientId}, + dataType:'json', + success:function(data){ + console.log("data == " +data); + if(null != data){ + $("#patientId").val(data.patientId); + $("#inpatientNo").val(data.inpatientNo); + $("#updateName").val(data.name); + $("#admissTimes").val(data.admissTimes); + $("#disDate").val(data.disDate); + loadDeptDefault(data.disDept); + $("#main_diag_name").val(data.mainDiagName); + } + } + }) +} + +/** + * 提交修改病案信息 + * @param patientId + */ +function updateCommomInfo() { + $.ajax({ + type:'post', + url:path+'/commom/updateCommomInfo', + data:$("#form").serialize(), + dataType:'json', + success:function(data){ + if(data!=null && data.code == 0){ + toastr.success("修改成功!"); + freshTable(); + $('#myModal2').modal('hide'); + }else{ + toastr.warning(data.msg); + } + } + }) +} + //批量下载功能 function downloadZip(typeId){ var patientIds = "";