Merge branch 'master' of http://120.27.212.36:10101/r/EMR_Record

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("上传出错了,请联系系统管理员!");
         }
     }
+
 }

src/main/java/com/emr/dao/CommomMapper.java

@@ -100,4 +100,6 @@ public interface CommomMapper {
      * @return
      */
     int selectCommomCount();
+
+    int selectCountByPatients(String inpatientNo);
 }

src/main/java/com/emr/dao/Zd_Cm3Mapper.java

@@ -11,4 +11,6 @@ public interface Zd_Cm3Mapper {
     int insertSelective(Zd_Cm3 record);
 
     List<Zd_Cm3> selectAll(@Param("code")String code,@Param("name")String name);
+
+
 }

src/main/resources/mapper/CommomMapper.xml

@@ -96,6 +96,14 @@
     <select id="selectAll" resultMap="BaseResultMap" parameterType="java.lang.String">
         ${sql}
     </select>
+    <select id="selectCountByPatients" parameterType="java.lang.String" resultType="java.lang.Integer">
+        select
+          count(0)
+        from
+          commomtable
+        where
+            patient_id = #{patientId,jdbcType=VARCHAR}
+    </select>
     <!--根据patientIds查询集合-->
     <select id="selectAllByPatients" resultMap="BaseResultMap" parameterType="java.lang.String">
         SELECT

src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp

@@ -199,10 +199,13 @@
                     <form>
                         <!--查询的sql-->
                         <input type="hidden" id="sql">
+                        <!--查询的菜单权限-->
+                        <input type="hidden" id="powerMenu">
                         <!--登录者Id-->
-                        <input type="hidden" id="userId" value="${CURRENT_USER.userName}">
+                        <input type="hidden" id="userId" value="${CURRENT_USER.userId}">
                         <input type="hidden" id="roleId" value="${CURRENT_USER.roleId}">
                         <input type="hidden" id="userName" value="${CURRENT_USER.userName}">
+                        <input type="hidden" id="powerMenus" value="${power_menus}">
                         <input type="hidden" id="showRecord" value="${CURRENT_USER.userTel}">
                         <input type="hidden" id="downloadRecord" value="${CURRENT_USER.userEmail}">
                         <input type="hidden" id="showPrint" value="${CURRENT_USER.userAge}">
@@ -665,6 +668,103 @@
             </div>
         </div>
     </div>
+    <!-- 模态框2（Modal）修改信息 -->
+    <div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                        <font size="30">&times;</font>
+                    </button>
+                    <h4 class="modal-title" style="font-weight: bold">
+                        修改信息
+                    </h4>
+                </div>
+                <div class="modal-body">
+                    <form class="form-horizontal" role="form" id="form">
+                        <input type="hidden" id="patientId" name="patientId">
+                        <div class="row">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label">病案号：</label>
+                                <div class="col-sm-7">
+                                    <input type="text" class="form-control input-sm input" id="inpatientNo" name="inpatientNo">
+                                </div>
+                                <div class="col-sm-1"></div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label">姓名：</label>
+                                <div class="col-sm-7">
+                                    <input type="text" class="form-control input-sm input" id="updateName" name="name">
+                                </div>
+                                <div class="col-sm-1"></div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label">次数：</label>
+                                <div class="col-sm-7">
+                                    <input type="number" class="form-control input-sm input" id="admissTimes" name="admissTimes">
+                                </div>
+                                <div class="col-sm-1"></div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label">出院时间：</label>
+                                <div class="col-sm-7">
+                                    <input type="text" class="form-control input-sm input" name="disDate" id="disDate" maxlength="10">
+                                </div>
+                                <div class="col-sm-1"></div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label">出院科室：</label>
+                                <div class="col-sm-7">
+                                    <select class="selectpicker form-control input-sm inputValue" id="disDept" name="disDept"
+                                            style="max-height:400px!important;overflow:scroll;"
+                                            data-live-search="true"></select>
+                                </div>
+                                <div class="col-sm-1"></div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="form-group">
+                                <label class="col-sm-4 control-label">主诊名称：</label>
+                                <div class="col-sm-7">
+                                    <%--<input type="text" class="form-control input-sm input" name="mainDiagName" id="mainDiagName">--%>
+                                    <input class="form-control input-sm otherTable diagTable inputValue"
+                                           id="main_diag_name"
+                                           name="mainDiagName"
+                                           onkeyup="getDiagNameContents('main_diag_name')"
+                                           onfocus="getDiagNameContents('main_diag_name')"
+                                           maxlength="16">
+                                        <div id="main_diag_nameDiv" style="position: absolute;z-index: 2000">
+                                            <table id="main_diag_nameContent_table" bgcolor="#FFFAFA" border="0"
+                                                   cellspacing="0" cellpadding="0">
+                                                <tbody id="main_diag_nameContent"></tbody>
+                                            </table>
+                                        </div>
+                                </div>
+                                <div class="col-sm-1"></div>
+                            </div>
+                        </div>
+
+                    </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-sm btn-default" data-dismiss="modal">
+                        关闭
+                    </button>
+                    <button type="button" class="btn btn-sm btn-primary" onclick="updateCommomInfo()">
+                        提交
+                    </button>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 <script>
     $(function () {
@@ -675,5 +775,6 @@
 <script type="text/javascript" src="${path}/static/js/recordManage/templateSearch/searchCommomMethodqf.js"></script>
 <script type="text/javascript" src="${path}/static/js/dateUtil.js"></script>
 <script type="text/javascript" src="${path}/static/js/approveManage/approveList/approveDateCommmomMethod.js"></script>
+<script type="text/javascript" src="${path}/static/js/commom.js"></script>
 </body>
 </html>

src/main/webapp/static/js/commom.js

@@ -24,4 +24,7 @@ function appendSelect(selectId,data,allFlag){
         }
         $("#"+selectId).append(html);
     }
-}
+}
+
+
+

src/main/webapp/static/js/dateUtil.js

@@ -81,6 +81,5 @@ function pickTime(info){
     })
 }
 
-function getDefaultNumAndMaxNum() {
 
-}
+

src/main/webapp/static/js/recordManage/commomSearch/commomList.js

@@ -63,6 +63,7 @@ function loadDept(){
 	})
 }
 
+
 //加载转归情况
 function loadDiagStatus(){
 	$.ajax({

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 = '<option value="">请选择</option>';
+                /*for (var i = 0; i < data.length; i++) {
+                    if(data[i].name != '' && data[i].name == defaultDeptName){
+                        html += '<option value="'+data[i].name+'" selected>'+data[i].name+'</option>';
+                    } else {
+                        html += '<option value="'+data[i].name+'">'+data[i].name+'</option>';
+                    }
+                }*/
+                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 += '<option data-tokens="' + name + '|' + py[0] + '|' + pingyin + '" value="' + name + '" selected>' + name + '</option>';
+                    } else {
+                        var name = data[i].name;
+                        var py = makePy(name);
+                        var pingyin = ConvertPinyin(name);
+                        html += '<option data-tokens="' + name + '|' + py[0] + '|' + pingyin + '" value="' + name + '">' + name + '</option>';
+                    }
+                }
+                $("#disDept").append(html);
+                $("#disDept").selectpicker('refresh');
+            }
+        }
+    })
+}
+
 //加载转归情况
 function loadDiagStatus() {
     $.ajax({
@@ -633,9 +670,9 @@ function getDiagNameContents(id) {
             }
         }
     } else {
-        clearContent(id);
         return;
     }
+    clearContent('main_diag_name')
 }
 
 //级联手术编码
@@ -691,19 +728,24 @@ function insertContent(content, id) {
     var json = JSON.parse(content);
     for (key in json) {
         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') {
+        if (id == 'main_diag_name'){
-            td2.innerHTML = key;
+            td1.innerHTML = json[key];
-            td4.innerHTML = json[key];
+            tr.appendChild(td1);
         } else {
-            td2.innerHTML = json[key];
+            if (id == 'inpatient_no' || id == 'diag_code' || id == 'operate_code') {
-            td4.innerHTML = key;
+                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';
@@ -712,6 +754,9 @@ function insertContent(content, id) {
         tr.onmouseout = function () {
             this.className = 'mouseOut';
         };
+        tr.onclick = function () {
+            clearContent(id);
+        }
     }
 }
 

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 += '<button type="button" class="btn btn-success TableView btn-sm" onclick="unlock('+patientId+')">解锁</button>';
+		str += '<button type="button" class="btn btn-sm btn-success" onclick="unlock('+patientId+')">解锁</button>';
 	}else{
+        if (userId == 1 || updatePower == 'true'){
+            str += '<button type="button" class="btn btn-sm btn-info TableView btn-sm" data-toggle="modal" data-target="#myModal2" onclick="getUpdateCommomInfo('+patientId+')">修改</button>';
+		}
 		if((null != isShowDetail && isShowDetail == 1) || showRecord == "1"){
 			str += '<a type="button" href="'+returnShowDetailUrl(row.patientId)+'" class="btn btn-danger TableView btn-sm" target="_blank">查看详情</a>';
 		}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 = "";