diff --git a/src/main/java/com/emr/controller/VCountController.java b/src/main/java/com/emr/controller/VCountController.java index 4a16fba9..8e20cdea 100644 --- a/src/main/java/com/emr/controller/VCountController.java +++ b/src/main/java/com/emr/controller/VCountController.java @@ -9,6 +9,7 @@ package com.emr.controller; import com.emr.entity.*; import com.emr.service.*; import com.emr.util.ThreadExcelUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -41,6 +42,17 @@ public class VCountController { @ResponseBody @RequestMapping(value = "/vCountList") public OffsetLimitPage faultList(HttpServletRequest request, HttpServletResponse response, V_Count vCount, Integer offset, Integer limit) { + response.setCharacterEncoding("utf-8"); + //判断所有都为空则签收日期按当前日期 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if(StringUtils.isBlank(vCount.getDeptCode())&& StringUtils.isBlank(vCount.getOverdueDays()) && StringUtils.isBlank(vCount.getStartDate()) && StringUtils.isBlank(vCount.getEndDate())){ + if (StringUtils.isBlank(vCount.getStartDate())) { + vCount.setStartDate(sdf.format(new Date())); + } + if (StringUtils.isBlank(vCount.getEndDate())) { + vCount.setEndDate(sdf.format(new Date())); + } + } OffsetLimitPage result = v_countService.selectPageByClo(vCount,offset, limit); return result; } diff --git a/src/main/java/com/emr/controller/faultController.java b/src/main/java/com/emr/controller/faultController.java index 704cfe10..4c8367fb 100644 --- a/src/main/java/com/emr/controller/faultController.java +++ b/src/main/java/com/emr/controller/faultController.java @@ -57,12 +57,12 @@ public class faultController { public void exportExcel(HttpServletResponse response, Emr_Fault_Vo emrFaultVo) throws Exception { response.setContentType("application/vnd.ms-excel;charset=UTF-8"); String[] header = {"病历清单id","住院号","住院次数","姓名","出院科室","出院日期","归档状态","评分","回退内容","缺陷选项","缺陷内容","创建时间"}; - String[] fileNames = {"archiveDetailId","inpNo","visitId","name","deptName","dischargeDateTime","archivestate","score","backContent","assortId","content","createTime"}; + String[] fileNames = {"id","inpNo","visitId","name","deptName","dischargeDateTime","archivestate","score","backContent","typeName","content","createTime"}; //文件名 String fileName = "缺陷信息数据" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; //构造excel的数据 - List list = emrFaultDetailService.selectByCol(emrFaultVo); - Emr_Dictionary dic = new Emr_Dictionary(); + List list = emrFaultDetailService.getQualityControlList(emrFaultVo); + /*Emr_Dictionary dic = new Emr_Dictionary(); dic.setEffective(1); dic.setTypecode("dept_code"); //科室列表 @@ -102,7 +102,7 @@ public class faultController { list.get(i).setDeptAdmissionTo(dept2); } } - } + }*/ ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames); /* System.out.println("开始执行导出......."); long start = System.currentTimeMillis();*/ diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index 244d2aca..f32b5c79 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -89,13 +89,16 @@ public class signListController { public OffsetLimitPage signList(HttpServletRequest request, HttpServletResponse response, Sign_List_Vo signListVo, Integer offset, Integer limit) throws UnsupportedEncodingException { response.setCharacterEncoding("utf-8"); request.setCharacterEncoding("utf-8"); + //判断所有都为空则签收日期按当前日期 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - //签收日期没进行选择的话则默认显示的是当前日期的数据 - if (signListVo.getStartSignDate() == null || "".equals(signListVo.getStartSignDate())) { - signListVo.setStartSignDate(sdf.format(new Date())); - } - if (signListVo.getEndSignDate() == null || "".equals(signListVo.getEndSignDate())) { - signListVo.setEndSignDate(sdf.format(new Date())); + if(StringUtils.isBlank(signListVo.getInpNo())&&StringUtils.isBlank(signListVo.getVisitId())&&signListVo.getC1()==null){ + //签收日期没进行选择的话则默认显示的是当前日期的数据 + if (StringUtils.isBlank(signListVo.getStartSignDate())) { + signListVo.setStartSignDate(sdf.format(new Date())); + } + if (StringUtils.isBlank(signListVo.getEndSignDate())) { + signListVo.setEndSignDate(sdf.format(new Date())); + } } OffsetLimitPage result = signListService.selectSignList(signListVo, offset, limit); return result; diff --git a/src/main/java/com/emr/controller/storageController.java b/src/main/java/com/emr/controller/storageController.java index 51611a53..2c41c8c1 100644 --- a/src/main/java/com/emr/controller/storageController.java +++ b/src/main/java/com/emr/controller/storageController.java @@ -50,10 +50,25 @@ public class storageController { @ResponseBody @RequestMapping(value = "/StorageList") - public OffsetLimitPage recallList(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit) { - OffsetLimitPage result = emrFaultDetailService.selectStorageByCol(emrFaultVo, offset, limit); + public OffsetLimitPage recallList(HttpServletRequest request, HttpServletResponse response,Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { + OffsetLimitPage result = archiveMasterService.selectStorageByCol(archiveMasterVo, offset, limit); return result; } + + @ResponseBody + @RequestMapping(value = "/exportExcelStorageList") + public void exportExcelStorageList(HttpServletResponse response,Archive_Master_Vo archiveMasterVo) throws Exception { + response.setContentType("application/vnd.ms-excel;charset=UTF-8"); + String[] header = {"病历清单id","住院号","住院次数","名字","性别","入院科室","入院日期","出院科室","出院日期","状态","封存人","封存日期"}; + String[] fileNames = {"id","inpNo","visitId","name","sex","deptAdmissionTo","admissionDateTime","deptName","dischargeDateTime","archivestate","handleName","handleTime"}; + //文件名 + String fileName = "病案封存列表" + new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + ".xls"; + //构造excel的数据 + List list=archiveMasterService.selectStorageByCol(archiveMasterVo); + ThreadExcelUtils utils = new ThreadExcelUtils(fileName, "", header, fileNames); + String result=utils.exportExcelToFilePath(response,utils.listConvert(list)); + } + @ResponseBody @RequestMapping(value = "/exportExcel") public void exportExcel(HttpServletResponse response,Archive_Master_Vo archiveMasterVo) throws Exception { @@ -69,7 +84,7 @@ public class storageController { } /** - *病案封存 + * 病案封存 * 将已封存数据转换成未封存 * 新增操作时日志记录 */ diff --git a/src/main/java/com/emr/dao/Archive_MasterMapper.java b/src/main/java/com/emr/dao/Archive_MasterMapper.java index e08e90d7..4a0de797 100644 --- a/src/main/java/com/emr/dao/Archive_MasterMapper.java +++ b/src/main/java/com/emr/dao/Archive_MasterMapper.java @@ -149,4 +149,12 @@ public interface Archive_MasterMapper { * @return */ List getObservationRecordList(Archive_Master_Vo master); + + + /** + * 封存查询记录 + * @param record + * @return + */ + List selectStorageByCol(Archive_Master_Vo record); } \ No newline at end of file diff --git a/src/main/java/com/emr/service/Archive_MasterService.java b/src/main/java/com/emr/service/Archive_MasterService.java index 9eb45aa2..d3a71c46 100644 --- a/src/main/java/com/emr/service/Archive_MasterService.java +++ b/src/main/java/com/emr/service/Archive_MasterService.java @@ -221,6 +221,21 @@ public interface Archive_MasterService { List selectByCmtByColumn(Archive_Master_Vo archiveMasterVo,Integer offset, Integer limit); List selectByUnfileAndColumn(Archive_Master_Vo archiveMasterVo,Integer offset, Integer limit); + + /** + * 封存查询记录分页 + * @param archiveMasterVo + * @param offset + * @param limit + * @return + */ + OffsetLimitPage selectStorageByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit); + /** + * 封存查询记录 + * @param record + * @return + */ + List selectStorageByCol(Archive_Master_Vo record); } diff --git a/src/main/java/com/emr/service/Emr_Fault_DetailService.java b/src/main/java/com/emr/service/Emr_Fault_DetailService.java index aa22882b..a7247c4d 100644 --- a/src/main/java/com/emr/service/Emr_Fault_DetailService.java +++ b/src/main/java/com/emr/service/Emr_Fault_DetailService.java @@ -105,8 +105,18 @@ public interface Emr_Fault_DetailService { */ List selectStorageByCol(Emr_Fault_Vo emrFaultVo); - List getQualityControlList(Emr_Fault_Vo emrFaultVo);//获取质控缺陷评分列表 + /** + * 获取质控缺陷评分列表 + * @param emrFaultVo + * @return + */ + List getQualityControlList(Emr_Fault_Vo emrFaultVo); + /** + * 获取质控缺陷评分列表分页 + * @param emrFaultVo + * @return + */ OffsetLimitPage getQualityControlList(Emr_Fault_Vo emrFaultVo, Integer offset, Integer limit); } diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java index 1dec3b20..38f86367 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -296,6 +296,19 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { return list; } + + @Override + public OffsetLimitPage selectStorageByCol(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { + PageHelper.offsetPage(offset, limit); + List list = archiveMasterMapper.selectStorageByCol(archiveMasterVo); + return new OffsetLimitPage((Page) list); + } + + @Override + public List selectStorageByCol(Archive_Master_Vo archiveMasterVo) { + return archiveMasterMapper.selectStorageByCol(archiveMasterVo); + } + @Override public OffsetLimitPage selectByLast(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) { List list = selectByLastByColumn(archiveMasterVo, offset, limit); diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index aaa2ce4e..c4b2e013 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -57,7 +57,7 @@ and id=#{patientId,jdbcType=VARCHAR} )+'%' - and admission_date_time=(select admission_date_time from Archive_Master where 1=1 + and admission_date_time in(select admission_date_time from Archive_Master where 1=1 and id=#{patientId,jdbcType=VARCHAR} ) @@ -86,7 +86,7 @@ and id=#{patientId,jdbcType=VARCHAR} )+'%' - and admission_date_time=(select admission_date_time from Archive_Master where 1=1 + and admission_date_time in(select admission_date_time from Archive_Master where 1=1 and id=#{patientId,jdbcType=VARCHAR} ) @@ -111,7 +111,7 @@ and id=#{masterid,jdbcType=VARCHAR} )+'%' - and admission_date_time=(select admission_date_time from Archive_Master where 1=1 + and admission_date_time in (select admission_date_time from Archive_Master where 1=1 and id=#{masterid,jdbcType=VARCHAR} ) @@ -216,7 +216,7 @@ and id=#{patientId,jdbcType=VARCHAR} - and admission_date_time=(select admission_date_time from Archive_Master where 1=1 + and admission_date_time in(select admission_date_time from Archive_Master where 1=1 and id=#{patientId,jdbcType=VARCHAR} ) @@ -237,7 +237,7 @@ and id=#{patientId,jdbcType=VARCHAR} )+'%' - and admission_date_time=(select admission_date_time from Archive_Master where 1=1 + and admission_date_time in(select admission_date_time from Archive_Master where 1=1 and id=#{patientId,jdbcType=VARCHAR} ) diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index d0d752ce..a990813a 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -155,9 +155,10 @@ + + \ No newline at end of file diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml index ac501999..21d0fa35 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -239,6 +239,18 @@ #{item} + + + and CONVERT(VARCHAR(100),m.discharge_date_time,23) between CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23) and + CONVERT(VARCHAR(100),#{endDate,jdbcType=NCHAR},23) + + + and CONVERT(VARCHAR(100),m.discharge_date_time,23) >= CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23) + + + and CONVERT(VARCHAR(100),m.discharge_date_time,23) <=CONVERT(VARCHAR(100),#{endDate,jdbcType=NCHAR},23) + + @@ -513,9 +525,21 @@ and f.updater = #{updater,jdbcType=NVARCHAR} - + + + + and CONVERT(VARCHAR(100),f.update_time,23) between CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23) and + #{endDate,jdbcType=NCHAR} + + + and CONVERT(VARCHAR(100),f.update_time,23) >= CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23) + + + and CONVERT(VARCHAR(100),f.update_time,23) <= #{endDate,jdbcType=NCHAR} + + and m.inp_no like '%'+#{inpNo,jdbcType=NCHAR}+'%' @@ -542,60 +566,63 @@ \ No newline at end of file diff --git a/src/main/resources/mapper/Sign_ListMapper.xml b/src/main/resources/mapper/Sign_ListMapper.xml index 55844225..9ba7d6de 100644 --- a/src/main/resources/mapper/Sign_ListMapper.xml +++ b/src/main/resources/mapper/Sign_ListMapper.xml @@ -64,54 +64,58 @@ diff --git a/src/main/resources/mapper/V_CountMapper.xml b/src/main/resources/mapper/V_CountMapper.xml index d677189c..650af97e 100644 --- a/src/main/resources/mapper/V_CountMapper.xml +++ b/src/main/resources/mapper/V_CountMapper.xml @@ -53,20 +53,20 @@ and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7) - and discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and - #{endDate,jdbcType=NCHAR}+ ' 23:59:59' + and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR} - and discharge_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) - and discharge_date_time <= #{endDate,jdbcType=NCHAR}+ ' 23:59:59' + and CONVERT(VARCHAR(10),discharge_date_time,120) <= #{endDate,jdbcType=NCHAR} group by dept_name) as t on c.dept_name= t.dept_name left join (select dept_name,COUNT(*) AS isOutNum from archive_master as s where s.ArchiveState!='在院' and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7) - + + + + and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR} + + + and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + + + and CONVERT(VARCHAR(10),discharge_date_time,120) <= #{endDate,jdbcType=NCHAR} + + group by dept_name) as t1 on c.dept_name= t1.dept_name - left join ( SELECT a.dept_name,ISNULL(timeOutNum, 0) timeOutNum FROM archive_master AS a LEFT JOIN ( select s.dept_name as dept_name,COUNT(*) AS timeOutNum from archive_master as s @@ -96,7 +107,7 @@ and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7) group by dept_name ) x ON a.dept_name = x.dept_name - + + + + and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR} + + + and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + + + and CONVERT(VARCHAR(10),discharge_date_time,120) <= #{endDate,jdbcType=NCHAR} + + ) as n1 on c.dept_name= n1.dept_name left join (select dept_name,COUNT(*) AS fileNum from archive_master as s where s.ArchiveState in('已归档','已认证') and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7) - + + + + and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR} + + + and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + + + and CONVERT(VARCHAR(10),discharge_date_time,120) <= #{endDate,jdbcType=NCHAR} + + group by dept_name) as t2 on c.dept_name= t2.dept_name left join (select dept_name,COUNT(*) AS unfileNum from archive_master as s where s.ArchiveState not in('已归档','已认证') and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7) - + + + + and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR} + + + and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + + + and CONVERT(VARCHAR(10),discharge_date_time,120) <= #{endDate,jdbcType=NCHAR} + + group by dept_name) as t3 on c.dept_name= t3.dept_name left join (select dept_name,COUNT(*) AS deathNum from archive_master as s where s.DISCHARGE_DISPOSITION=5 and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7) - + + + + and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR} + + + and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + + + and CONVERT(VARCHAR(10),discharge_date_time,120) <= #{endDate,jdbcType=NCHAR} + + group by dept_name) as t4 on c.dept_name= t4.dept_name left join (select dept_name,COUNT(*) AS Num from archive_master as s where s.ArchiveState in('已归档','已认证') and datediff(d,discharge_date_time,getdate())<=2 and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7) - + + + + and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR} + + + and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + + + and CONVERT(VARCHAR(10),discharge_date_time,120) <= #{endDate,jdbcType=NCHAR} + + group by dept_name) as t5 on c.dept_name= t5.dept_name left join (select dept_name,COUNT(*) AS Num from archive_master as s where s.ArchiveState in('已归档','已认证') and datediff(d,discharge_date_time,getdate())<=3 and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7) - + + + + and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR} + + + and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + + + and CONVERT(VARCHAR(10),discharge_date_time,120) <= #{endDate,jdbcType=NCHAR} + + group by dept_name) as t6 on c.dept_name= t6.dept_name left join (select dept_name,COUNT(*) AS Num from archive_master as s where s.ArchiveState in('已归档','已认证') and datediff(d,discharge_date_time,getdate())<=7 and not (datepart(weekday,discharge_date_time)=1 or datepart(weekday,discharge_date_time)=7) - + + + + and CONVERT(VARCHAR(10),discharge_date_time,120) between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR} + + + and CONVERT(VARCHAR(10),discharge_date_time,120) >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) + + + and CONVERT(VARCHAR(10),discharge_date_time,120) <= #{endDate,jdbcType=NCHAR} + + group by dept_name) as t7 on c.dept_name= t7.dept_name left join (SELECT code,Name FROM emr_dictionary ) as t8 on c.dept_name=t8.code ) v_count where 1=1 diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index 145f16da..a6d2dc50 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -1903,7 +1903,7 @@ //初始化类别 var selectStr = ""; - + var assortIdArr=[]; function getAssortFun() { $.ajax({ url: "${path}/zdAssort/getAssort", @@ -1912,12 +1912,14 @@ async: true, success: function (result) { if (result.length > 0) { + assortIdArr=[]; if (result != null) { selectStr = ""; } @@ -1997,9 +1999,10 @@ toastr.success("操作成功!"); //$('#addFile').attr("src", $("#outDateLab").val() + ".pdf");//.val($("#outDateLab").val()+".pdf"); //toastr.error("上传PDF失败!"); + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); - initTree($("#idLab").html()); + } }); @@ -2880,13 +2883,6 @@ $(function () { - - //日期控件 - $(".input-daterange").datepicker({ - format: "yyyy-mm-dd", - language: "zh-CN" - }); - var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); if (index != null && index != "" && index.indexOf("excel") != -1) { @@ -2989,6 +2985,16 @@ getDoctorInCharge(); }); + //日期控件 + $(".input-daterange").datepicker({ + format: "yyyy-mm-dd", + language: "zh-CN" + }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startDateTo').val(currDate30); + $('#endDateTo').val(currDate); + $("#imgsClearBtn2").click(function () { //console.log("===清空删除页的图片==="); $(".img_div2").empty(); @@ -4833,12 +4839,19 @@ return html; }, events: { 'click .editInfo': function (e, value, row, index) { + //判断是否包含类型 + var assortIDFlag=assortIdArr.indexOf(row.assortId); //console.log(row); if (row.pdfPath != null && row.pdfPath != "") { //console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1); if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) { $("#upPdfDiv").hide(); - $("#inpType").attr("disabled", "true"); + //判断该分段类是否存在，如果存在禁止修改，如果不存在则显示可修改项 + if(assortIDFlag!=-1) { + $("#inpType").attr("disabled", "true"); + }else{ + toastr.warning("分段类不存在,需修改类!"); + } } else { $("#upPdfDiv").show(); @@ -4852,14 +4865,20 @@ $("#addFile").show(); } else { $("#addFile").hide(); - $("#inpType").attr("disabled", "true"); + if(assortIDFlag!=-1) { + $("#inpType").attr("disabled", "true"); + }else{ + toastr.warning("分段类不存在,需修改类!"); + } } //同步 $("#inpId").val(row.id); $("#inpTitle").val(row.title); - $("#inpType").val(row.assortId); + if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){ + $("#inpType").val(row.assortId); + } $("#inpSource").val(row.source); $("#inpFlag").val(row.flag); $("#pageNumber").val(row.pageNumber); @@ -5170,12 +5189,13 @@ }, callback: { beforeClick: function (treeId, treeNode) { + $('#table2').bootstrapTable('uncheckAll'); $("#assortId").html(treeNode.id); //查询之后重新从第一页算起 $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); //刷新 $('#table2').bootstrapTable('refresh'); - // idArr = []; + idArr = []; } } }; @@ -5238,6 +5258,7 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量作废成功!"); @@ -5264,7 +5285,7 @@ data: {"id": id, flag: "0"}, success: function (result) { if (result == 1) { - + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量使用成功!"); @@ -5308,6 +5329,7 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("作废成功!"); diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index 4d471b88..8e1e8702 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -1703,7 +1703,7 @@ //初始化类别 var selectStr = ""; - + var assortIdArr=[]; function getAssortFun() { $.ajax({ url: "${path}/zdAssort/getAssort", @@ -1711,16 +1711,18 @@ //data: {patientId: $("#idLab").html()}, async: true, success: function (result) { - if (result.length > 0) { - if (result != null) { - selectStr = ""; + if (result != null && result.length > 0) { + assortIdArr=[]; + selectStr = ""; + + } }, error: function () { // toastr.error("加载失败!"); @@ -1787,18 +1789,20 @@ toastr.warning(result); } $('#assortModal').modal('hide'); //手动关闭 + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); - initTree($("#idLab").html()); + }, error: function (result) { $('#assortModal').modal('hide'); //手动关闭 toastr.success("操作成功!"); //$('#addFile').attr("src", $("#outDateLab").val() + ".pdf");//.val($("#outDateLab").val()+".pdf"); //toastr.error("上传PDF失败!"); + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); - initTree($("#idLab").html()); + } }); @@ -2316,11 +2320,6 @@ }); $(function () { - //日期控件 - $(".input-daterange").datepicker({ - format: "yyyy-mm-dd", - language: "zh-CN" - }); var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); @@ -2409,6 +2408,15 @@ } getDept(); }); + //日期控件 + $(".input-daterange").datepicker({ + format: "yyyy-mm-dd", + language: "zh-CN" + }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startDateTo').val(currDate30); + $('#endDateTo').val(currDate); $("#imgsClearBtn2").click(function () { //console.log("===清空删除页的图片==="); @@ -4162,12 +4170,12 @@ } if (row.source != null && row.source != "") { - if (row.source.indexOf("后台") != -1) { + //if (row.source.indexOf("后台") != -1) { if (index != null && index != "" && index.indexOf("delPage") != -1) { //return ''; html = html + '';// '删除'; } - } + //} } @@ -4177,12 +4185,19 @@ return html; }, events: { 'click .editInfo': function (e, value, row, index) { + //判断是否包含类型 + var assortIDFlag=assortIdArr.indexOf(row.assortId); //console.log(row); if (row.pdfPath != null && row.pdfPath != "") { //console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1); if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) { $("#upPdfDiv").hide(); - $("#inpType").attr("disabled", "true"); + //判断该分段类是否存在，如果存在禁止修改，如果不存在则显示可修改项 + if(assortIDFlag!=-1) { + $("#inpType").attr("disabled", "true"); + }else{ + toastr.warning("分段类不存在,需修改类!"); + } } else { $("#upPdfDiv").show(); @@ -4196,14 +4211,20 @@ $("#addFile").show(); } else { $("#addFile").hide(); - $("#inpType").attr("disabled", "true"); + if(assortIDFlag!=-1) { + $("#inpType").attr("disabled", "true"); + }else{ + toastr.warning("分段类不存在,需修改类!"); + } } //同步 $("#inpId").val(row.id); $("#inpTitle").val(row.title); - $("#inpType").val(row.assortId); + if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){ + $("#inpType").val(row.assortId); + } $("#inpSource").val(row.source); $("#inpFlag").val(row.flag); $("#pageNumber").val(row.pageNumber); @@ -4934,6 +4955,41 @@ var zNodes = []; var nodeList = []; + var setting = { + view: { + addHoverDom: false, + removeHoverDom: false, + selectedMulti: false, + autoCancelSelected: false + }, + check: { + enable: true + }, + data: { + simpleData: { + enable: true, + idKey: "id", + pIdKey: "pId", + rootPId: "0" + } + }, + edit: { + enable: false + }, + callback: { + beforeClick: function (treeId, treeNode) { + $('#table2').bootstrapTable('uncheckAll'); + $("#assortId").html(treeNode.id); + //查询之后重新从第一页算起 + $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); + //刷新 + //$('#table2').bootstrapTable('refresh'); + idArr = []; + } + } + }; + + function initTree(patientId) { var target = document.getElementById('foo'); spinner.spin(target);//给id为foo的div 中绑上spinner @@ -4983,40 +5039,6 @@ } - var setting = { - view: { - addHoverDom: false, - removeHoverDom: false, - selectedMulti: false, - autoCancelSelected: false - }, - check: { - enable: true - }, - data: { - simpleData: { - enable: true, - idKey: "id", - pIdKey: "pId", - rootPId: "0" - } - }, - edit: { - enable: false - }, - callback: { - beforeClick: function (treeId, treeNode) { - $("#assortId").html(treeNode.id); - //查询之后重新从第一页算起 - $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); - //刷新 - $('#table2').bootstrapTable('refresh'); - //idArr = []; - } - - } - }; - function searchNode() { var zTree = $.fn.zTree.getZTreeObj("ztree"); var value = $("#key").val(); @@ -5087,6 +5109,7 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量作废成功!"); @@ -5113,6 +5136,7 @@ data: {"id": id, flag: "0"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量使用成功!"); @@ -5156,6 +5180,7 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("作废成功!"); diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index ad331d19..f4027b58 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -272,7 +272,7 @@ } getFaultType(); - + var pageVal=0; function initTable() { if(tipLoad==1){ $("#table").bootstrapTable({ // 对应table标签的id @@ -422,6 +422,9 @@ field: 'deptName', align: 'left', valign: 'middle', + formatter: function (value, row, index) { + return value; + } }, { title: '出院日期', @@ -592,6 +595,7 @@ //查询之后重新从第一页算起 if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); //刷新 + //$('#table').bootstrapTable('refresh'); } else { toastr.warning("正在查询，请稍等..."); } @@ -621,16 +625,9 @@ }) } - getUserList() + getUserList(); $(function () { - - //日期控件 - $(".input-daterange").datepicker({ - format:"yyyy-mm-dd", - language:"zh-CN" - }); - var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); if (index != null && index != "" && index.indexOf("excel") != -1) { @@ -694,6 +691,15 @@ // }); }); + //日期控件 + $(".input-daterange").datepicker({ + format:"yyyy-mm-dd", + language:"zh-CN" + }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startDate').val(currDate30); + $('#endDate').val(currDate); initTable(); @@ -717,7 +723,7 @@ var startDate = "" + $("#startDate").val(); var endDate = "" + $("#endDate").val(); var archivestate = "" + $("#archivestate").val(); - var url = window.location.href; + /*var url = window.location.href; var deptName = url.substring(url.lastIndexOf('&') + 1).replace("depts=", ""); var len = ($("#deptName").val()).length; @@ -726,6 +732,13 @@ if (deptNameT.indexOf("") == -1) { deptName = $("#deptName").val().toString(); } + }*/ + + var deptName = $("#deptName").val(); + if (deptName.indexOf("") != -1) { + deptName = ""; + } else { + deptName = $("#deptName").val().toString(); } //主管医生、创建人、缺陷选项 diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index 77916d08..14b5677c 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -1107,12 +1107,13 @@ }, callback: { beforeClick: function (treeId, treeNode) { + $('#table2').bootstrapTable('uncheckAll'); $("#assortId").html(treeNode.id); //查询之后重新从第一页算起 $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); //刷新 - $('#table2').bootstrapTable('refresh'); - //idArr = []; + //$('#table2').bootstrapTable('refresh'); + idArr = []; } } @@ -1284,6 +1285,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startDateTo').val(currDate30); + $('#endDateTo').val(currDate); var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); @@ -1469,7 +1474,7 @@ function closeShadeImg() { // $(".shadeImg").fadeOut(500); } - + var assortIdArr=[]; function getAssortFun() { $.ajax({ url: "${path}/zdAssort/getAssort", @@ -1477,17 +1482,17 @@ //data: {patientId: $("#idLab").html()}, async: true, success: function (result) { - if (result.length > 0) { - if (result != null) { - selectStr = ""; + if (result != null && result.length > 0) { + assortIdArr=[]; + selectStr = ""; } }, error: function () { // toastr.error("加载失败!"); @@ -1555,18 +1560,20 @@ toastr.warning(result); } $('#assortModal').modal('hide'); //手动关闭 + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); - initTree($("#idLab").html()); + }, error: function (result) { $('#assortModal').modal('hide'); //手动关闭 toastr.success("操作成功!"); //$('#addFile').attr("src", $("#outDateLab").val() + ".pdf");//.val($("#outDateLab").val()+".pdf"); //toastr.error("上传PDF失败!"); + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); - initTree($("#idLab").html()); + } }); @@ -2892,12 +2899,18 @@ return html; }, events: { 'click .editInfo': function (e, value, row, index) { - + //判断是否包含类型 + var assortIDFlag=assortIdArr.indexOf(row.assortId); if (row.pdfPath != null && row.pdfPath != "") { //console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1); if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) { $("#upPdfDiv").hide(); - $("#inpType").attr("disabled", "true"); + //判断该分段类是否存在，如果存在禁止修改，如果不存在则显示可修改项 + if(assortIDFlag!=-1) { + $("#inpType").attr("disabled", "true"); + }else{ + toastr.warning("分段类不存在,需修改类!"); + } } else { $("#upPdfDiv").show(); @@ -2911,7 +2924,11 @@ $("#addFile").show(); } else { $("#addFile").hide(); - $("#inpType").attr("disabled", "true"); + if(assortIDFlag!=-1) { + $("#inpType").attr("disabled", "true"); + }else{ + toastr.warning("分段类不存在,需修改类!"); + } } @@ -2919,7 +2936,9 @@ //同步 $("#inpId").val(row.id); $("#inpTitle").val(row.title); - $("#inpType").val(row.assortId); + if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){ + $("#inpType").val(row.assortId); + } $("#inpSource").val(row.source); $("#inpFlag").val(row.flag); // console.log(row); @@ -3314,6 +3333,7 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量作废成功!"); @@ -3342,6 +3362,7 @@ data: {"id": id, flag: "0"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量使用成功!"); @@ -3364,6 +3385,7 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("作废成功!"); diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index c2fb1992..d6aed06b 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -493,22 +493,22 @@ -
- - -
-
- - -
+
+ + +
+
+ + +
<%--
--%> <%----%> <%--"; - for (i = 0; i < result.length; i++) { - selectStr += ""; - $("#inpGl").append(""); - $("#inpType").append(""); - } - selectStr += " "; + if (result != null && result.length > 0) { + assortIdArr=[]; + selectStr = ""; } }, error: function () { // toastr.error("加载失败!"); @@ -1937,18 +1937,20 @@ toastr.warning(result); } $('#assortModal').modal('hide'); //手动关闭 + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); - initTree($("#idLab").html()); + }, error: function (result) { $('#assortModal').modal('hide'); //手动关闭 toastr.success("操作成功!"); //$('#addFile').attr("src", $("#outDateLab").val() + ".pdf");//.val($("#outDateLab").val()+".pdf"); //toastr.error("上传PDF失败!"); + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); - initTree($("#idLab").html()); + } }); @@ -2418,17 +2420,17 @@ $("#verifyBtn").on('click', function () { var isscaned=""+$("#isScaned2").val(); var isSign=""+$("#isSign2").val(); - if(((isscaned=="1") && (isSign=="1"))||(isscaned=="0")){ - //无纸质 或 有纸质且已签收 - verinfyFun(); - }else{ - //弹窗是否强制提交 - $('#verinfyQZModal').modal({ - backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 - keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 - show: true//弹出对话框 - }); - } + if(((isscaned=="1") && (isSign=="1"))||(isscaned=="0")){ + //无纸质 或 有纸质且已签收 + verinfyFun(); + }else{ + //弹窗是否强制提交 + $('#verinfyQZModal').modal({ + backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 + keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。 + show: true//弹出对话框 + }); + } }); $("#verinfyQZBtn").on('click', function () { //有纸质且未签收，强制提交 @@ -2437,11 +2439,6 @@ }); $(function () { - //日期控件 - $(".input-daterange").datepicker({ - format: "yyyy-mm-dd", - language: "zh-CN" - }); var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); @@ -2498,6 +2495,18 @@ }); + //日期控件 + $(".input-daterange").datepicker({ + format: "yyyy-mm-dd", + language: "zh-CN" + }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startDateTo').val(currDate30); + $('#endDateTo').val(currDate); + $('#startDateTo2').val(currDate30); + $('#endDateTo2').val(currDate); + function getDept() { //获取科室列表 $.ajax({ @@ -3809,12 +3818,12 @@ } } if (index.indexOf("signFlg") != -1) { - if(row.isSign==0 && row.isscaned==1){ - //签收显示取消签收 - html += ''; + if(row.isSign==0 && row.isscaned==1){ + //签收显示取消签收 + html += ''; }else if(row.isSign==1 && row.isscaned==1){ - html += ''; - } + html += ''; + } } return html; @@ -3926,7 +3935,7 @@ var visitId=row.visitId; var isSign=1; if(inpNo!=null && inpNo!="" && inpNo!=undefined && inpNo!="undefined" - && visitId!=null && visitId!="" && inpNo!=undefined && visitId!="undefined"){ + && visitId!=null && visitId!="" && inpNo!=undefined && visitId!="undefined"){ updateSignStateFun(inpNo,visitId,isSign); }else{ toastr.warning("签收值格式应为：住院号-住院次数!"); @@ -4353,14 +4362,19 @@ return html; }, events: { 'click .editInfo': function (e, value, row, index) { - + //判断是否包含类型 + var assortIDFlag=assortIdArr.indexOf(row.assortId); //console.log(row); if (row.pdfPath != null && row.pdfPath != "") { //console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1); if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) { $("#upPdfDiv").hide(); - $("#inpType").attr("disabled", "true"); - + //判断该分段类是否存在，如果存在禁止修改，如果不存在则显示可修改项 + if(assortIDFlag!=-1) { + $("#inpType").attr("disabled", "true"); + }else{ + toastr.warning("分段类不存在,需修改类!"); + } } else { $("#upPdfDiv").show(); $("#inpType").removeAttr("disabled"); @@ -4373,14 +4387,19 @@ $("#addFile").show(); } else { $("#addFile").hide(); - $("#inpType").attr("disabled", "true"); + if(assortIDFlag!=-1) { + $("#inpType").attr("disabled", "true"); + }else{ + toastr.warning("分段类不存在,需修改类!"); + } } - //同步 $("#inpId").val(row.id); $("#inpTitle").val(row.title); - $("#inpType").val(row.assortId); + if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){ + $("#inpType").val(row.assortId); + } $("#inpSource").val(row.source); $("#inpFlag").val(row.flag); $("#pageNumber").val(row.pageNumber); @@ -4888,13 +4907,14 @@ }, callback: { beforeClick: function (treeId, treeNode) { + $('#table2').bootstrapTable('uncheckAll'); $("#assortId").html(treeNode.id); $("#source").html(""); //查询之后重新从第一页算起 $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); //刷新 - $('#table2').bootstrapTable('refresh'); - //idArr = []; + //$('#table2').bootstrapTable('refresh'); + idArr = []; } } @@ -4957,7 +4977,9 @@ type: "POST", data: {"id": id, flag: "1"}, success: function (result) { + //console.log(result); if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量作废成功!"); @@ -4984,6 +5006,7 @@ data: {"id": id, flag: "0"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量使用成功!"); @@ -5027,6 +5050,7 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("作废成功!"); diff --git a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp index 5566e0d1..614d1966 100644 --- a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp @@ -369,7 +369,7 @@
-
+
- @@ -1737,11 +1737,6 @@ } }); $(function () { - //日期控件 - $(".input-daterange").datepicker({ - format: "yyyy-mm-dd", - language: "zh-CN" - }); var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); @@ -1792,7 +1787,15 @@ // } }); - + //日期控件 + $(".input-daterange").datepicker({ + format: "yyyy-mm-dd", + language: "zh-CN" + }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startHandleTime').val(currDate30); + $('#endHandleTime').val(currDate); function getDept() { //获取科室列表 diff --git a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp index c931fb39..545c7cb1 100644 --- a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp @@ -274,7 +274,7 @@
-
+
- @@ -1611,12 +1611,6 @@ } }); $(function () { - //日期控件 - $(".input-daterange").datepicker({ - format: "yyyy-mm-dd", - language: "zh-CN" - }); - var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); @@ -1667,6 +1661,15 @@ }); + //日期控件 + $(".input-daterange").datepicker({ + format: "yyyy-mm-dd", + language: "zh-CN" + }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startDate').val(currDate30); + $('#endDate').val(currDate); function getDept() { //获取科室列表 diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp index 81513026..c0619ec9 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp @@ -139,12 +139,6 @@ $(function () { - //日期控件 - $(".input-daterange").datepicker({ - format: "yyyy-mm-dd", - language: "zh-CN" - }); - var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); if (index != null && index != "" && index.indexOf("excel") != -1) { @@ -155,7 +149,15 @@ $(".columns-right").hide(); } }); - + //日期控件 + $(".input-daterange").datepicker({ + format: "yyyy-mm-dd", + language: "zh-CN" + }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startDate').val(currDate30); + $('#endDate').val(currDate); //处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容 function DoOnCellHtmlData(cell, row, col, data) { diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp index b6b73fbb..1854dcd8 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp @@ -103,6 +103,7 @@
+
<%--
+
+ +
+ + - + +
+
@@ -282,11 +291,7 @@ var tipLoad = 1; $(function () { - //日期控件 - $(".input-daterange").datepicker({ - format: "yyyy-mm-dd", - language: "zh-CN" - }); + var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); @@ -340,8 +345,15 @@ getDept(); }); - - + //日期控件 + $(".input-daterange").datepicker({ + format: "yyyy-mm-dd", + language: "zh-CN" + }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startDate').val(currDate30); + $('#endDate').val(currDate); //处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容 function DoOnCellHtmlData(cell, row, col, data) { @@ -444,6 +456,8 @@ name:""+$("#name").val(), archivestate: "" + $("#archivestate").val(), state:"" + $("#state").val(), + startDate: $("#startDate").val(), + endDate: $("#endDate").val(), deptName: $("#deptName").val().toString() }; return temp; diff --git a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp index c1098c38..a0e4cdd6 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp @@ -1,4 +1,4 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> @@ -92,7 +92,14 @@
- +
+ +
+ + - + +
+
@@ -2184,7 +2181,7 @@ $('#table').bootstrapTable('refresh'); document.getElementById('archiveIdSign').select(); toastr.success(result); - $("#signModal").hide(); + $("#signModal").modal('hide'); }, error: function () { toastr.error("操作失败!"); } @@ -2214,12 +2211,6 @@ }); $(function () { - //日期控件 - $(".input-daterange").datepicker({ - format: "yyyy-mm-dd", - language: "zh-CN" - }); - var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); if (index != null && index != "" && index.indexOf("excel") != -1) { @@ -2275,8 +2266,15 @@ }); - - + //日期控件 + $(".input-daterange").datepicker({ + format: "yyyy-mm-dd", + language: "zh-CN" + }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startSignDate').val(currDate30); + $('#endSignDate').val(currDate); function getFaultType() { $("#faultTypeDiv").empty(); @@ -2916,6 +2914,7 @@ }); } + var scollPostion1 = null; var editSelRow=[]; var isscanedVal=""; @@ -3961,7 +3960,7 @@ $("#signBtn").click(function () { //生成表单token,防止表单重复提交 - setFormToken(); + //setFormToken(); //签收 $('#signModal').modal({ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 @@ -3978,6 +3977,7 @@ success: function (result) { if (result.indexOf("成功")!=-1) { $('#archiveIdSign').val(''); + setFormToken(); //刷新 $('#table').bootstrapTable('refresh'); toastr.success(result); @@ -4069,7 +4069,53 @@ //查询 $('#searchBtn').click(function () { if (tipLoad == 0) { + var startDate=$('#startSignDate').val(); + var endDate=$('#endSignDate').val(); + //所有其它条件都为空 + if(""+$("#inpNo").val().length<=0 && ""+$("#visitId").val().length<=0 &&""+ $("#signer").val().length<=0 ) { + //单位 + var dateType = "月"; + //上限 + var upperLimit = 1; + if ('<%=res.getString("dateType")%>'.trim() != "" && '<%=res.getString("dateType")%>' != null && '<%=res.getString("upperLimit")%>'.trim() != "" && '<%=res.getString("upperLimit")%>' != null) { + //单位 + dateType = '<%=res.getString("dateType")%>'; + //上限 + upperLimit = parseInt('<%=res.getString("upperLimit")%>'); + //console.log(dateType+"==单位=="+"==上限="+upperLimit); + if (endDate == null || endDate == "") { + var myDate = new Date(); + var nowY = myDate.getFullYear(); + var nowM = myDate.getMonth() + 1; + var nowD = myDate.getDate(); + endDate = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期 + } + if (startDate != null && startDate != "" && endDate != null && endDate != "") { + if (dateType == "year") { + var year = YearsBetw(startDate, endDate); + if (year > upperLimit) { + toastr.warning("出院日期按年算(总年数)不得超过" + upperLimit + "年!"); + return; + } + } else if (dateType == "month") { + var month = MonthsBetw(startDate, endDate); + if (month > upperLimit) { + toastr.warning("出院日期按月算(总月数)不得超过" + upperLimit + "月!"); + return; + } + } else { + //天 + var day = DateDiff(startDate, endDate); + if (day > upperLimit) { + toastr.warning("出院日期按天算(总天数)不得超过" + upperLimit + "天!"); + return; + } + } + } + } + } $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); + } else { toastr.warning("正在查询，请稍等..."); } diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index 5c9fe60e..4459bd17 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -1723,7 +1723,7 @@ //初始化类别 var selectStr = ""; - + var assortIdArr=[]; function getAssortFun() { $.ajax({ url: "${path}/zdAssort/getAssort", @@ -1731,16 +1731,16 @@ //data: {patientId: $("#idLab").html()}, async: true, success: function (result) { - if (result.length > 0) { - if (result != null) { - selectStr = ""; + if (result != null && result.length > 0) { + assortIdArr=[]; + selectStr = ""; } }, error: function () { //toastr.error("加载失败!"); @@ -1807,18 +1807,19 @@ toastr.warning(result); } $('#assortModal').modal('hide'); //手动关闭 + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); - initTree($("#idLab").html()); }, error: function (result) { $('#assortModal').modal('hide'); //手动关闭 toastr.success("操作成功!"); //$('#addFile').attr("src", $("#outDateLab").val() + ".pdf");//.val($("#outDateLab").val()+".pdf"); //toastr.error("上传PDF失败!"); + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); - initTree($("#idLab").html()); + } }); } @@ -2122,11 +2123,6 @@ } }); $(function () { - //日期控件 - $(".input-daterange").datepicker({ - format: "yyyy-mm-dd", - language: "zh-CN" - }); var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); @@ -2177,7 +2173,15 @@ // } }); - + //日期控件 + $(".input-daterange").datepicker({ + format: "yyyy-mm-dd", + language: "zh-CN" + }); + var currDate=getCurrDate(); + var currDate30=getCurrDay30(); + $('#startDate').val(currDate30); + $('#endDate').val(currDate); function getDept() { //获取科室列表 @@ -3803,13 +3807,19 @@ return html; }, events: { 'click .editInfo': function (e, value, row, index) { + //判断是否包含类型 + var assortIDFlag=assortIdArr.indexOf(row.assortId); //console.log(row); if (row.pdfPath != null && row.pdfPath != "") { //console.log("===:" + row.pdfPath.indexOf(row.assortId + ".pdf") != -1); if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) { $("#upPdfDiv").hide(); - $("#inpType").attr("disabled", "true"); - + //判断该分段类是否存在，如果存在禁止修改，如果不存在则显示可修改项 + if(assortIDFlag!=-1) { + $("#inpType").attr("disabled", "true"); + }else{ + toastr.warning("分段类不存在,需修改类!"); + } } else { $("#upPdfDiv").show(); $("#inpType").removeAttr("disabled"); @@ -3822,14 +3832,20 @@ $("#addFile").show(); } else { $("#addFile").hide(); - $("#inpType").attr("disabled", "true"); + if(assortIDFlag!=-1) { + $("#inpType").attr("disabled", "true"); + }else{ + toastr.warning("分段类不存在,需修改类!"); + } } //同步 $("#inpId").val(row.id); $("#inpTitle").val(row.title); - $("#inpType").val(row.assortId); + if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){ + $("#inpType").val(row.assortId); + } $("#inpSource").val(row.source); $("#inpFlag").val(row.flag); $("#pageNumber").val(row.pageNumber); @@ -4143,12 +4159,13 @@ }, callback: { beforeClick: function (treeId, treeNode) { + $('#table2').bootstrapTable('uncheckAll'); $("#assortId").html(treeNode.id); //查询之后重新从第一页算起 $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); //刷新 - $('#table2').bootstrapTable('refresh'); - //idArr = []; + //$('#table2').bootstrapTable('refresh'); + idArr = []; } } @@ -4212,6 +4229,7 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量作废成功!"); @@ -4238,6 +4256,7 @@ data: {"id": id, flag: "0"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("批量使用成功!"); @@ -4260,6 +4279,7 @@ data: {"id": id, flag: "1"}, success: function (result) { if (result == 1) { + initTree($("#idLab").html()); //刷新 $('#table2').bootstrapTable('refresh'); toastr.success("作废成功!"); diff --git a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp index 895ac196..65f3cd9d 100644 --- a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp +++ b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp @@ -1,15 +1,17 @@ -<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" import="java.util.ResourceBundle"%> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> 科室统计 - + <%ResourceBundle res = ResourceBundle.getBundle("config.jdbc"); %> + + <%@include file="../../jspf/comm.jspf" %>