1.界面调整

2.新增参数设置控制申请最大时间

src/main/java/com/emr/controller/otherManage/CommomSetController.java

@@ -1,6 +1,6 @@
 package com.emr.controller.otherManage;
 
-import com.emr.dao.EmrComomSetMapper;
+import com.alibaba.fastjson.JSON;
 import com.emr.entity.EmrComomSet;
 import com.emr.entity.ResultUtil;
 import com.emr.service.CommomSetService;
@@ -38,4 +38,11 @@ public class CommomSetController {
             return ResultUtil.error("保存出错了,请联系系统管理员");
         }
     }
+
+    @RequestMapping(value = "getCommomSetList")
+    @ResponseBody
+    public String getCommomSetList(){
+        EmrComomSet comomSet = commomSetService.selectByPrimaryKey(1);
+        return JSON.toJSONString(comomSet);
+    }
 }

src/main/java/com/emr/entity/EmrComomSet.java

@@ -7,6 +7,10 @@ public class EmrComomSet implements Serializable {
 
     private Short times;
 
+    private int defaultDay;
+
+    private int maxDay;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -25,6 +29,22 @@ public class EmrComomSet implements Serializable {
         this.times = times;
     }
 
+    public int getDefaultDay() {
+        return defaultDay;
+    }
+
+    public void setDefaultDay(int defaultDay) {
+        this.defaultDay = defaultDay;
+    }
+
+    public int getMaxDay() {
+        return maxDay;
+    }
+
+    public void setMaxDay(int maxDay) {
+        this.maxDay = maxDay;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -33,6 +53,8 @@ public class EmrComomSet implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", times=").append(times);
+        sb.append(", defaultDay=").append(defaultDay);
+        sb.append(", maxDay=").append(maxDay);
         sb.append("]");
         return sb.toString();
     }

src/main/resources/mapper/EmrComomSetMapper.xml

@@ -4,9 +4,11 @@
   <resultMap id="BaseResultMap" type="com.emr.entity.EmrComomSet" >
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="times" property="times" jdbcType="SMALLINT" />
+    <result column="defaultDay" property="defaultDay" jdbcType="INTEGER" />
+    <result column="maxDay" property="maxDay" jdbcType="INTEGER" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, times
+    id, times, defaultDay, maxDay
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -19,8 +21,8 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.emr.entity.EmrComomSet" >
-    insert into emr_comom_set (id, times)
+    insert into emr_comom_set (id, times, defaultDay, maxDay)
-    values (#{id,jdbcType=INTEGER}, #{times,jdbcType=SMALLINT})
+    values (#{id,jdbcType=INTEGER}, #{times,jdbcType=SMALLINT}, #{defaultDay,jdbcType=INTEGER}, #{maxDay,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.emr.entity.EmrComomSet" >
     insert into emr_comom_set
@@ -31,6 +33,12 @@
       <if test="times != null" >
         times,
       </if>
+      <if test="defaultDay != null" >
+        defaultDay,
+      </if>
+      <if test="maxDay != null" >
+        maxDay,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -39,6 +47,12 @@
       <if test="times != null" >
         #{times,jdbcType=SMALLINT},
       </if>
+      <if test="defaultDay != null" >
+        #{defaultDay,jdbcType=INTEGER},
+      </if>
+      <if test="maxDay != null" >
+        #{maxDay,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.emr.entity.EmrComomSet" >
@@ -47,12 +61,18 @@
       <if test="times != null" >
         times = #{times,jdbcType=SMALLINT},
       </if>
+      <if test="defaultDay != null" >
+        #{defaultDay,jdbcType=INTEGER},
+      </if>
+      <if test="maxDay != null" >
+        #{maxDay,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.emr.entity.EmrComomSet" >
     update emr_comom_set
-    set times = #{times,jdbcType=SMALLINT}
+    set times = #{times,jdbcType=SMALLINT}, defaultDay = #{defaultDay,jdbcType=INTEGER}, maxDay = #{maxDay,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

src/main/webapp/WEB-INF/views/otherManage/commomSetList.jsp

@@ -98,12 +98,32 @@
                            name="times" id="times" oninput="if(value.length>1)value=value.slice(0,1)">
                 </div>
             </div>
+            <div class="searchInputElement left" style="margin-left: 10px; margin-top: 20px;">
+                <div class="searchElement left">
+                    <label class="labelDiv">申请日期默认可申请天数：</label>
+                </div>
+                <div class="searchInput left">
+                    <input type="number" min="1" max="365" class="form-control input-sm" value="${comomSet.defaultDay}"
+                           name="defaultDay" id="defaultDay" onblur="checkNum('defaultDay')">
+                </div>
+            </div>
+            <div class="searchInputElement left" style="margin-left: 10px; margin-top: 20px;">
+                <div class="searchElement left">
+                    <label class="labelDiv">申请日期最大可申请天数：</label>
+                </div>
+                <div class="searchInput left">
+                    <input type="number" min="1" max="365" class="form-control input-sm" value="${comomSet.maxDay}"
+                           name="maxDay" id="maxDay" onblur="checkNum('maxDay')">
+                </div>
+            </div>
         </form>
     </div>
     <div class="btnsDiv">
-        <shiro:hasPermission name="/commomSet/update">
+        <div style="margin-top: 130px;">
-            <button type="button" class="btn btn-sm btn-primary btns" onclick="save()">保存</button>
+            <shiro:hasPermission name="/commomSet/update">
-        </shiro:hasPermission>
+                <button type="button" class="btn btn-sm btn-primary btns" onclick="save()">保存</button>
+            </shiro:hasPermission>
+        </div>
     </div>
 </div>
 <script type="text/javascript" src="${path}/static/js/otherManage/commomSet.js?t=4"></script>

src/main/webapp/WEB-INF/views/otherManage/downloadInfoList174.jsp

@@ -100,18 +100,18 @@
         <div class="searchDiv">
             <div class="searchInput left">
                 <div class="searchElement left">
-                    <label class="labelDiv">姓名：</label>
+                    <label class="labelDiv">病案号：</label>
                 </div>
                 <div class="searchInputElement left">
-                    <input type="text" class="form-control input-sm" id="name">
+                    <input type="text" class="form-control input-sm" id="inpatientNo">
                 </div>
             </div>
             <div class="searchInput left">
                 <div class="searchElement left">
-                    <label class="labelDiv">病案号：</label>
+                    <label class="labelDiv">姓名：</label>
                 </div>
                 <div class="searchInputElement left">
-                    <input type="text" class="form-control input-sm" id="inpatientNo">
+                    <input type="text" class="form-control input-sm" id="name">
                 </div>
             </div>
             <div class="searchInput left">

src/main/webapp/WEB-INF/views/otherManage/printInfoList174.jsp

@@ -100,18 +100,18 @@
             <div class="searchDiv">
                 <div class="searchInput left">
                     <div class="searchElement left">
-                        <label class="labelDiv">姓名：</label>
+                        <label class="labelDiv">病案号：</label>
                     </div>
                     <div class="searchInputElement left">
-                        <input type="text" class="form-control input-sm" id="name">
+                        <input type="text" class="form-control input-sm" id="inpatientNo">
                     </div>
                 </div>
                 <div class="searchInput left">
                     <div class="searchElement left">
-                        <label class="labelDiv">病案号：</label>
+                        <label class="labelDiv">姓名：</label>
                     </div>
                     <div class="searchInputElement left">
-                        <input type="text" class="form-control input-sm" id="inpatientNo">
+                        <input type="text" class="form-control input-sm" id="name">
                     </div>
                 </div>
                 <div class="searchInput left">

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

@@ -12,7 +12,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta http-equiv=X-UA-Compatible IE=EmulateIE7>
-    <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css" type="text/css">
+    <link rel="stylesheet"
+          href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css"
+          type="text/css">
     <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/css/select2.min.css" rel="stylesheet"/>
 
@@ -220,13 +222,13 @@
                         </div>
                         <!--表格头-->
                         <input type="hidden" id="tableThNames"
-                               value="病案号,ID号,住院次数,姓名,性别,年龄_岁,年龄_月,联系地址,入院日期,出院日期,出院科室,主诊ICD码,主诊名称,主诊转归,住院天数,主治医生,是否有手术">
+                               value="病案号,ID号,住院次数,姓名,性别,年龄_岁,年龄_月,入院日期,出院日期,出院科室,联系地址,主诊ICD码,主诊名称,主诊转归,住院天数,主治医生,是否有手术">
                         <!--查询字段-->
                         <input type="hidden" id="englishFields"
-                               value="commomtable.inpatient_no,commomtable.admiss_id,commomtable.admiss_times,commomtable.name,commomtable.sex,commomtable.age,commomtable.age_month,commomtable.home_addr,commomtable.admiss_date,commomtable.dis_date,commomtable.dis_dept,commomtable.main_diag_code,commomtable.main_diag_name,commomtable.main_dis_thing,commomtable.admiss_days,commomtable.attending,commomtable.is_oper">
+                               value="commomtable.inpatient_no,commomtable.admiss_id,commomtable.admiss_times,commomtable.name,commomtable.sex,commomtable.age,commomtable.age_month,commomtable.admiss_date,commomtable.dis_date,commomtable.dis_dept,commomtable.home_addr,commomtable.main_diag_code,commomtable.main_diag_name,commomtable.main_dis_thing,commomtable.admiss_days,commomtable.attending,commomtable.is_oper">
                         <!--数据字段-->
                         <input type="hidden" id="fields"
-                               value="inpatientNo,admissId,admissTimes,name,sex,age,ageMonth,homeAddr,admissDate,disDate,disDept,mainDiagCode,mainDiagName,mainDisThing,admissDays,attending,isOper">
+                               value="inpatientNo,admissId,admissTimes,name,sex,age,ageMonth,admissDate,disDate,disDept,homeAddr,mainDiagCode,mainDiagName,mainDisThing,admissDays,attending,isOper">
                         <!--显示字段-->
                         <input type="hidden" id="fieldCns">
                         <!--查询总行数-->

src/main/webapp/static/js/approveManage/approveList/approveList174.js

@@ -246,8 +246,17 @@ function refreshTable(){
     })
 }
 
+//批量添加按钮
+function addApproves(){
+    pickTime("effeTime5");
+    form5.reset();
+    //加载申请原因模板
+    loadSelect(path+ '/approve/loadReasonModle','parentId5','');
+}
+
 //添加按钮
 function addApprove(){
+    pickTime("effeTime");
     setFormToken();
     $("#inpatientNo").removeAttr("readonly");
     $("#name").removeAttr("readonly");
@@ -326,6 +335,7 @@ function addSimple(){
 }
 //编辑
 function updateApprove(id){
+    pickTime("effeTime")
     //加载申请原因模板
     loadSelect(path+ '/approve/loadReasonModle','parentId','');
     $("#inpatientNo").prop("readonly",true);

src/main/webapp/static/js/approveManage/approveList/approveSaveCommomMethodBlood.js

@@ -11,7 +11,6 @@ function add(){
 
 //封装模态框保存公共方法，applyState:提交状态1保存未提交2已提交.msg:操作后提示信息
 function saveMethod(applyState){
-	debugger
 	var inpatientNo = $("#inpatientNo").val();
 	var name = $("#name").val();
 	if($("#effeTime").val() != ''){

src/main/webapp/static/js/approveManage/approveManageList/approveManageList174.js

@@ -88,6 +88,23 @@ $('#mytab').bootstrapTable({
             title:'有效天数',
             field:'effeDays',
         },
+        {
+            title:'审批状态',
+            field:'approveState',
+            formatter: function (value, row, index) {
+                var spanValue;
+                if(value == '已过期'){
+                    spanValue = '<p class="text-danger">已过期</p>';
+                }else if(value == '待审批'){
+                    spanValue = '<p style="color:grey">待审批</p>';
+                }else if(value == '审核通过'){
+                    spanValue = '<p class="text-success">审核通过</p>';
+                }else if(value == '审核不通过'){
+                    spanValue = '<p class="text-danger">审核不通过</p>';
+                }
+                return spanValue;
+            }
+        },
         {
             title:'姓名',
             field:'name',
@@ -113,23 +130,6 @@ $('#mytab').bootstrapTable({
             title:'申请类型',
             field:'applyType',
         },
-        {
-            title:'审批状态',
-            field:'approveState',
-            formatter: function (value, row, index) {
-                var spanValue;
-                if(value == '已过期'){
-                    spanValue = '<p class="text-danger">已过期</p>';
-                }else if(value == '待审批'){
-                    spanValue = '<p style="color:grey">待审批</p>';
-                }else if(value == '审核通过'){
-                    spanValue = '<p class="text-success">审核通过</p>';
-                }else if(value == '审核不通过'){
-                    spanValue = '<p class="text-danger">审核不通过</p>';
-                }
-                return spanValue;
-            }
-        },
         {
             title:'审批时间',
             field:'approveTime',

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

@@ -55,3 +55,32 @@ function showTime(days){
     var eDate = year + "-" + month + "-" + strDate;
     return eDate;
 }
+
+function pickTime(info){
+    var defaultDay = new Date();
+    var maxDay = new Date();
+    $.ajax({
+        type:'get',
+        url:path+'/commomSet/getCommomSetList',
+        dataType:'json',
+        success:function(data){
+            if(data != null || data != ''){
+                defaultDay.setDate(defaultDay.getDate() + data.defaultDay);
+                maxDay.setDate(maxDay.getDate() + data.maxDay);
+                console.log("defaultDay = " + defaultDay);
+                console.log("maxDay =" + maxDay);
+                $('#'+info).datepicker({
+                    language: "zh-CN",
+                    format: "yyyy-mm-dd",
+                    autoclose: true,//选中之后自动隐藏日期选择框,
+                })
+                $('#'+info).datepicker('setDate', defaultDay);
+                $('#'+info).datepicker('setEndDate', maxDay);
+            }
+        }
+    })
+}
+
+function getDefaultNumAndMaxNum() {
+
+}

src/main/webapp/static/js/font/showRecordIframeBlood.js

@@ -132,7 +132,6 @@ function onloadJpgForPdf(){
 }
 //记录打印记录
 function printInfoBlood(){
-	debugger
 	alert(2)
 	var patientId = "'"+$("#patientId").val()+"'";
 	var assortIds = $("#assortIds").val();

src/main/webapp/static/js/otherManage/commomSet.js

@@ -23,3 +23,19 @@ function save(){
         toastr.warning("保存失败,组数不能为空");
     }
 }
+
+function checkNum(numName) {
+    var maxNum = Number($("#maxDay").val());
+    var defaultNum = Number($("#defaultDay").val());
+    if (numName == 'defaultDay') {
+        if (defaultNum > maxNum) {
+            $("#defaultDay").val(maxNum);
+        }
+    }
+    if (numName == 'maxDay') {
+        if (maxNum < defaultNum) {
+            $("#maxDay").val(defaultNum);
+        }
+    }
+
+}

src/main/webapp/static/js/otherManage/downloadInfoCommomJs174.js

@@ -64,14 +64,14 @@ $('#mytab').bootstrapTable({
             title:'操作人',
             field:'creater',
         },
-        {
-            title:'姓名',
-            field:'name',
-        },
         {
             title:'病案号',
             field:'inpatientNo',
         },
+        {
+            title:'姓名',
+            field:'name',
+        },
         {
             title:'住院次数',
             field:'admissTimes',

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

@@ -689,7 +689,6 @@ function insertContent(content, id) {
     clearContent(id);
     setLocation(id);
     var json = JSON.parse(content);
-    debugger
     for (key in json) {
         console.log(key)
         console.log(json[key])

src/main/webapp/static/js/recordManage/templateSearch/customSearchIframeqf.js

@@ -142,7 +142,6 @@ function getSql() {
 			var age_month = '';
 			var age_day = '';
 			$("#block").children().find('div').each(function () {
-				debugger
 				var val = $(this).children().val();
 				var className = $(this).children().attr('class');
 				if (className == 'select2') {
@@ -237,7 +236,6 @@ function getSql() {
 			var orderBys = " order by " + commomtable + ".inpatient_no," + commomtable + ".admiss_times";
 			var sql = selectNames + fromTableNames + whereNames;
 			$("#orderBys").val(orderBys);
-			debugger
 			$("#sql").val(sql);
 			console.log("sql = " + $("#sql").val());
 			//console.log(sql);

src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethod174.js

@@ -759,7 +759,6 @@ function add(){
 
 //封装模态框保存公共方法，applyState:提交状态1保存未提交2已提交.msg:操作后提示信息
 function saveMethod(applyState,msg,typeId){
-	debugger
 	if($("#effeTime").val() != ''){
 		var patientIds = $("#check").val();
 		if(patientIds == '') {
@@ -1032,7 +1031,6 @@ function getLockPatientIds(){
 }
 //过滤下载，导出pdf，查看详情的patientId集合:typeId:已借阅审批病案id集合或已下载审批病案id集合
 function powerPotient(patientIds,flag,typeId){
-	debugger
 	//有权限的过滤
 	//通过且未过期的可查看的
 	var approves = $("#"+typeId).val();

src/main/webapp/static/js/recordManage/templateSearch/searchCommomMethodqf.js

@@ -622,6 +622,7 @@ function borrowing(patientId){
 
 //批量申请借阅
 function borrowings(){
+    pickTime("effeTime");
 	$("#typeId").val('approves');
 	//加载申请借阅类型
 	loadApplyType(1);