diff --git a/src/main/java/com/emr/controller/VCountController.java b/src/main/java/com/emr/controller/VCountController.java index 8e20cdea..a9b893ab 100644 --- a/src/main/java/com/emr/controller/VCountController.java +++ b/src/main/java/com/emr/controller/VCountController.java @@ -44,15 +44,15 @@ public class VCountController { 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.getDeptCode())&& StringUtils.isBlank(vCount.getOverdueDays()) && StringUtils.isBlank(vCount.getStartDate()) && StringUtils.isBlank(vCount.getEndDate())){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); 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/inHospitalController.java b/src/main/java/com/emr/controller/inHospitalController.java index 576fb497..1bb242eb 100644 --- a/src/main/java/com/emr/controller/inHospitalController.java +++ b/src/main/java/com/emr/controller/inHospitalController.java @@ -1164,7 +1164,7 @@ public class inHospitalController { String type = null; String oldName = ""; - // 成功获取原名字 + // 成功获取原名字 console.log( $("#inpTitle").val()+"======="+row.title); String fileName = null; //type = fileName.indexOf(".") != -1 ? fileName.substring(fileName.lastIndexOf(".") + 1, fileName.length()) : null; //System.out.println("图片初始名称为：" + fileName + " 类型为：" + type); @@ -1192,18 +1192,18 @@ public class inHospitalController { fileName = format2.format(new Date()) + file.getOriginalFilename(); entity.setPdfPath(path.replace("\\\\", "\\") + fileName); } - entity.setTitle(title); + entity.setFlag(flag); entity.setSource(source); //"emr_medical_record" entity.setSys(sys); - Archive_Detail detail = new Archive_Detail(); int bol = 0; //PDF文件操作 if (!id.equals("")) { entity.setId(id); detail = archiveDetailService.selectByid(id); + entity.setTitle(title); if (detail != null) { //判断类型是否变更 if (assortID.equals(detail.getAssortid())) { @@ -1220,6 +1220,7 @@ public class inHospitalController { } } //根据id修改记录 + entity.setMasterid(detail.getMasterid()); bol = archiveDetailService.updateCloById(entity); } diff --git a/src/main/java/com/emr/controller/signListController.java b/src/main/java/com/emr/controller/signListController.java index f32b5c79..94c975f0 100644 --- a/src/main/java/com/emr/controller/signListController.java +++ b/src/main/java/com/emr/controller/signListController.java @@ -90,8 +90,8 @@ public class signListController { response.setCharacterEncoding("utf-8"); request.setCharacterEncoding("utf-8"); //判断所有都为空则签收日期按当前日期 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); - if(StringUtils.isBlank(signListVo.getInpNo())&&StringUtils.isBlank(signListVo.getVisitId())&&signListVo.getC1()==null){ + /*if(StringUtils.isBlank(signListVo.getInpNo())&&StringUtils.isBlank(signListVo.getVisitId())&&signListVo.getC1()==null){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); //签收日期没进行选择的话则默认显示的是当前日期的数据 if (StringUtils.isBlank(signListVo.getStartSignDate())) { signListVo.setStartSignDate(sdf.format(new Date())); @@ -99,7 +99,7 @@ public class signListController { 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/entity/Archive_Detail_Vo.java b/src/main/java/com/emr/entity/Archive_Detail_Vo.java index fd787236..12b426be 100644 --- a/src/main/java/com/emr/entity/Archive_Detail_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Detail_Vo.java @@ -16,6 +16,7 @@ public class Archive_Detail_Vo { private String title; private String flag; private String sys; + private String inpNo; private int pageNumber; private String assortId; private String assortName; @@ -131,6 +132,14 @@ public class Archive_Detail_Vo { this.sys = sys == null ? null : sys.trim(); } + public String getInpNo() { + return inpNo; + } + + public void setInpNo(String inpNo) { + this.inpNo = inpNo; + } + public int getPageNumber() { return this.pageNumber; } diff --git a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java index 8a9d7e23..4302e99e 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -234,7 +234,8 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { if (master!= null) { String inpNo = master.getInpNo(); if (inpNo != null && !"".equals(inpNo)) { - newList.setTitle(newList.getTitle() +"_"+ inpNo); + //newList.setTitle(newList.getTitle() +"_"+ inpNo); + newList.setInpNo(inpNo); } } return newList; diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 9ec40176..9e9f4435 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,15 +1,12 @@ POWER_IP=10.6.1.127 +jdbc.username=sa jdbc.password=docus@702 dataBaseName=DB_PrivilegeManagement_GYFY -#POWER_IP=localhost -#jdbc.password=docus702 -#dataBaseName=zj_record_new - -POWER_PORT=8080 - +POWER_PORT=9001 jdbc.url=jdbc\:sqlserver\://${POWER_IP}:1433;databaseName=${dataBaseName} + jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver -jdbc.username=sa + #hibernate config hibernate.dialect=org.hibernate.dialect.SQLServerDialect hibernate.show_sql=true @@ -19,46 +16,52 @@ hibernate.hbm2ddl.auto=update hibernate.current_session_context_class=thread hibernate.jdbc.batch_size=50 hibernate.enable_lazy_load_no_trans=true -#图片地址 -pictureUrl=Z:\\test\\uploadImage -#本地自动生成PDF地址D:\tesst\autoPdf -autoPdfUrl=D:/test/autoPdf -#本地上传PDF地址 -pdfUrl=Z:\\test\\loadPdf -#PDF文件不存在或损坏列表地址 -pdfErrorUrl=Z:\\test\\error\\ -#超期天数 +#\u56FE\u7247\u5730\u5740 +pictureUrl=C:\\Users\\Administrator\\Desktop\\test\\uploadImage +#\u672C\u5730\u81EA\u52A8\u751F\u6210PDF\u5730\u5740D:\tesst\autoPdf +autoPdfUrl=C:/Users/Administrator/Desktop/test/autoPdf +#\u672C\u5730\u4E0A\u4F20PDF\u5730\u5740 +pdfUrl=C:\\Users\\Administrator\\Desktop\\test\\loadPdf +#PDF\u6587\u4EF6\u4E0D\u5B58\u5728\u6216\u635F\u574F\u5217\u8868\u5730\u5740 +pdfErrorUrl=C:\\Users\\Administrator\\Desktop\\test\\error\\ +#\u8D85\u671F\u5929\u6570 expired=7 -#死亡超期天数 +#\u6B7B\u4EA1\u8D85\u671F\u5929\u6570 deathExpired=7 +#\u7EDF\u8BA1\u5217\u8868 \u4E0A\u9650\u5355\u4F4D\u53CA\u4E0A\u9650\u6570\u503C[year\month\day],\u90FD\u4E0D\u9650\u5236\u5219\u4E3A\u7A7A +dateType=month +upperLimit=3 +#\u7B7E\u6536\u5217\u8868 \u4E0A\u9650\u5355\u4F4D\u53CA\u4E0A\u9650\u6570\u503C[year\month\day],\u90FD\u4E0D\u9650\u5236\u5219\u4E3A\u7A7A +sign_dateType=month +sign_upperLimit=6 -#原因 -recallReason=医院需要这份文档 -#权限系统接口 +#\u539F\u56E0 +recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863 +#\u6743\u9650\u7CFB\u7EDF\u63A5\u53E3 powerUrl=http://${POWER_IP}:${POWER_PORT}/power/font/getMenusByUserIdAndSysFlag POWER_URLHEAD=http://${POWER_IP}:${POWER_PORT}/power POWER_JSP=http://${POWER_IP}:${POWER_PORT}/power powerGetUserList=http://${POWER_IP}:${POWER_PORT}/power/font/getUserList?userName=admin -#完整性接口 +#\u5B8C\u6574\u6027\u63A5\u53E3 HomepageDictionary=http://${POWER_IP}:9999/WholeCheckInterface/services/HomepageDictionary?wsdl HomepageMethod=CheckData EMRQualityControl=http://10.6.0.170:57772/csp/healthshare/jhipnew/JHIPLIB.SOAP.BS.XmlService.cls?CfgItem=JH5003MRAtoEMR EMRQualityControlParamName=Message -#定时清空（每天4点触发0 0 4 * * ?）:本地自动生成PDF地址autoPdfUrl及PDF文件不存在或损坏列表地址 +#\u5B9A\u65F6\u6E05\u7A7A\uFF08\u6BCF\u59294\u70B9\u89E6\u53D10 0 4 * * ?\uFF09:\u672C\u5730\u81EA\u52A8\u751F\u6210PDF\u5730\u5740autoPdfUrl\u53CAPDF\u6587\u4EF6\u4E0D\u5B58\u5728\u6216\u635F\u574F\u5217\u8868\u5730\u5740 fileDelay=0 0 4 * * ? -#定时重置完整性信息 :每天3点触发0 0 3 * * ?,每1秒执行一次0/1 * * * * ? +#\u5B9A\u65F6\u91CD\u7F6E\u5B8C\u6574\u6027\u4FE1\u606F :\u6BCF\u59293\u70B9\u89E6\u53D10 0 3 * * ?,\u6BCF1\u79D2\u6267\u884C\u4E00\u6B210/1 * * * * ? fixedDelay=0 0 3 * * ? allAddortIds = 00000000 #pdf\u6C34\u5370 -pdfWater = \u5e7f\u4e1c\u533b\u79d1\u5927\u5b66\u9644\u5c5e\u533b\u9662 +pdfWater = \u5E7F\u4E1C\u533B\u79D1\u5927\u5B66\u9644\u5C5E\u533B\u9662 -#菜单接口http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag +#\u83DC\u5355\u63A5\u53E3http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag #powerUrl=http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag #POWER_URLHEAD=http://120.27.212.36:8888/power -#power权限系统的服务器地址头如：http://192.168.1.3:8081/power +#power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934\u5982\uFF1Ahttp://192.168.1.3:8081/power -PdfIsError = D:\\test070802 \ No newline at end of file +PdfIsError = C:\\Users\\Administrator\\Desktop\\test\\test070802 \ No newline at end of file diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index c4b2e013..d1b2cdaf 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -57,10 +57,10 @@ and id=#{patientId,jdbcType=VARCHAR} )+'%' - and admission_date_time in(select admission_date_time from Archive_Master where 1=1 - - and id=#{patientId,jdbcType=VARCHAR} - ) + and admission_date_time in(select admission_date_time from Archive_Master where 1=1 + + and id=#{patientId,jdbcType=VARCHAR} + ) and patindex('%B%',inp_no) != 0 and id!=#{patientId,jdbcType=VARCHAR} ) table2 diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index a990813a..62537916 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -1460,6 +1460,9 @@ and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and #{endDate,jdbcType=NCHAR}+ ' 23:59:59' + + and m.discharge_date_time between CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) and + #{endDate,jdbcType=NCHAR}+ ' 23:59:59' and m.discharge_date_time >= CONVERT(VARCHAR(10),#{startDate,jdbcType=NCHAR},120) @@ -1675,10 +1678,10 @@ ,m.admission_date_time,m.DISCHARGE_DISPOSITION,d.handle_time,d.handle_name,d.following_type from(select * from Archive_Master where ArchiveState!='作废') m LEFT JOIN( - select master_id ,handle_time ,handle_name,following_type from ( - select ROW_NUMBER() over(partition by master_id order by handle_time desc) RowNum - ,Archive_Master_Following.* - from Archive_Master_Following where 1=1 ) as t1 where 1=1 and RowNum = 1 + select master_id ,handle_time ,handle_name,following_type from ( + select ROW_NUMBER() over(partition by master_id order by handle_time desc) RowNum + ,Archive_Master_Following.* + from Archive_Master_Following where 1=1 ) as t1 where 1=1 and RowNum = 1 and following_type='11' ) d on m.id=d.master_id LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index a6d2dc50..a6896be4 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -2990,10 +2990,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /* var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDateTo').val(currDate30); - $('#endDateTo').val(currDate); + $('#endDateTo').val(currDate);*/ $("#imgsClearBtn2").click(function () { //console.log("===清空删除页的图片==="); @@ -4847,11 +4847,12 @@ if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) { $("#upPdfDiv").hide(); //判断该分段类是否存在，如果存在禁止修改，如果不存在则显示可修改项 - if(assortIDFlag!=-1) { - $("#inpType").attr("disabled", "true"); - }else{ + if(assortIDFlag==-1) { toastr.warning("分段类不存在,需修改类!"); } + /*else{ + $("#inpType").attr("disabled", "true"); + }*/ } else { $("#upPdfDiv").show(); @@ -4865,11 +4866,12 @@ $("#addFile").show(); } else { $("#addFile").hide(); - if(assortIDFlag!=-1) { - $("#inpType").attr("disabled", "true"); - }else{ + if(assortIDFlag==-1) { toastr.warning("分段类不存在,需修改类!"); } + /*else{ + $("#inpType").attr("disabled", "true"); + }*/ } diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index 8e1e8702..522501fe 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -2413,10 +2413,14 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /* var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDateTo').val(currDate30); $('#endDateTo').val(currDate); + $('#startDateTo4').val(currDate30); + $('#endDateTo4').val(currDate); + $('#startDateTo5').val(currDate30); + $('#endDateTo5').val(currDate);*/ $("#imgsClearBtn2").click(function () { //console.log("===清空删除页的图片==="); @@ -4193,11 +4197,12 @@ if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) { $("#upPdfDiv").hide(); //判断该分段类是否存在，如果存在禁止修改，如果不存在则显示可修改项 - if(assortIDFlag!=-1) { - $("#inpType").attr("disabled", "true"); - }else{ + if(assortIDFlag==-1) { toastr.warning("分段类不存在,需修改类!"); } + /*else{ + $("#inpType").attr("disabled", "true"); + }*/ } else { $("#upPdfDiv").show(); @@ -4211,11 +4216,12 @@ $("#addFile").show(); } else { $("#addFile").hide(); - if(assortIDFlag!=-1) { - $("#inpType").attr("disabled", "true"); - }else{ + if(assortIDFlag==-1) { toastr.warning("分段类不存在,需修改类!"); } + /*else{ + $("#inpType").attr("disabled", "true"); + }*/ } diff --git a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp index f4027b58..f4e62563 100644 --- a/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp +++ b/src/main/webapp/WEB-INF/views/faultDir/faultList.jsp @@ -112,18 +112,18 @@
- <%----%> - -
- -
- <%-- - --%> + + <%-- --%> +
+ +
+ <%-- + --%> <%--
--%>
@@ -617,7 +617,7 @@ if (data != null) { for (var i = 0; i < data.length; i++) { $("#doctorInCharge").append(""); - // $("#creater").append(""); + $("#creater").append(""); } } $(".selectpicker").selectpicker('refresh'); @@ -627,6 +627,8 @@ getUserList(); + + $(function () { var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); @@ -696,10 +698,10 @@ format:"yyyy-mm-dd", language:"zh-CN" }); - var currDate=getCurrDate(); + /*var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDate').val(currDate30); - $('#endDate').val(currDate); + $('#endDate').val(currDate);*/ initTable(); diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index 14b5677c..8a3a3741 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -1285,10 +1285,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /*var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDateTo').val(currDate30); - $('#endDateTo').val(currDate); + $('#endDateTo').val(currDate);*/ var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); @@ -2906,11 +2906,12 @@ if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) { $("#upPdfDiv").hide(); //判断该分段类是否存在，如果存在禁止修改，如果不存在则显示可修改项 - if(assortIDFlag!=-1) { - $("#inpType").attr("disabled", "true"); - }else{ + if(assortIDFlag==-1) { toastr.warning("分段类不存在,需修改类!"); } + /*else{ + $("#inpType").attr("disabled", "true"); + }*/ } else { $("#upPdfDiv").show(); @@ -2924,11 +2925,12 @@ $("#addFile").show(); } else { $("#addFile").hide(); - if(assortIDFlag!=-1) { - $("#inpType").attr("disabled", "true"); - }else{ + if(assortIDFlag==-1) { toastr.warning("分段类不存在,需修改类!"); } + /*else{ + $("#inpType").attr("disabled", "true"); + }*/ } diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index d6aed06b..d9b90aef 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -915,9 +915,12 @@
-
- +
+
+ <%--
+ - +
--%>
@@ -933,7 +936,7 @@
- +
@@ -1911,6 +1914,7 @@ formData.append('masterID', $("#idLab").html()); formData.append('assortID', $("#inpType").val()); formData.append('title', $("#inpTitle").val()); + if ($("#pageNumber").val() < 1) { $("#pageNumber").val(1); } @@ -2500,12 +2504,12 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /*var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDateTo').val(currDate30); $('#endDateTo').val(currDate); $('#startDateTo2').val(currDate30); - $('#endDateTo2').val(currDate); + $('#endDateTo2').val(currDate);*/ function getDept() { //获取科室列表 @@ -4269,6 +4273,15 @@ field: 'title', align: 'left', valign: 'middle', + formatter: function (value, row, index) { + var a=""; + if(row.inpNo!=null && row.inpNo!=""){ + a=value+row.inpNo; + }else{ + a=value; + } + return a; + } }, { title: '上传时间', @@ -4363,18 +4376,23 @@ }, events: { 'click .editInfo': function (e, value, row, index) { //判断是否包含类型 - var assortIDFlag=assortIdArr.indexOf(row.assortId); + var assortIDFlag=0; + if(assortIdArr!=null && assortIdArr!=""){ + assortIDFlag=assortIdArr.indexOf(row.assortId); + } + //console.log(row.assortId+"======"+assortIDFlag); //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(); //判断该分段类是否存在，如果存在禁止修改，如果不存在则显示可修改项 - if(assortIDFlag!=-1) { - $("#inpType").attr("disabled", "true"); - }else{ - toastr.warning("分段类不存在,需修改类!"); + if(assortIDFlag==-1) { + toastr.warning("分段类不存在,需修改类!"); } + /*else{ + $("#inpType").attr("disabled", "true"); + }*/ } else { $("#upPdfDiv").show(); $("#inpType").removeAttr("disabled"); @@ -4387,18 +4405,27 @@ $("#addFile").show(); } else { $("#addFile").hide(); - if(assortIDFlag!=-1) { - $("#inpType").attr("disabled", "true"); - }else{ + if(assortIDFlag==-1) { toastr.warning("分段类不存在,需修改类!"); } + /*else{ + $("#inpType").attr("disabled", "true"); + }*/ } //同步 $("#inpId").val(row.id); $("#inpTitle").val(row.title); + $("#inpNoB").val("_"+row.inpNo); if(row.assortId!=null && row.assortId!="" && assortIDFlag!=-1){ $("#inpType").val(row.assortId); + }else{ + + } + if(row.inpNo!=null &&row.inpNo!=""){ + $("#inpNoB").show(); + }else{ + $("#inpNoB").hide(); } $("#inpSource").val(row.source); $("#inpFlag").val(row.flag); @@ -4909,6 +4936,7 @@ beforeClick: function (treeId, treeNode) { $('#table2').bootstrapTable('uncheckAll'); $("#assortId").html(treeNode.id); + $("#source").html(""); //查询之后重新从第一页算起 $('#table2').bootstrapTable('refreshOptions', {limit: 1, offset: 10}); diff --git a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp index 614d1966..849068bc 100644 --- a/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalHandlerDir/medicalHandlerList.jsp @@ -1792,10 +1792,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /* var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startHandleTime').val(currDate30); - $('#endHandleTime').val(currDate); + $('#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 545c7cb1..5b17d46e 100644 --- a/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalOverdueDir/medicalOverdueList.jsp @@ -1666,10 +1666,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /*var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDate').val(currDate30); - $('#endDate').val(currDate); + $('#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 c0619ec9..e8eb4bfe 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp @@ -154,10 +154,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /*var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDate').val(currDate30); - $('#endDate').val(currDate); + $('#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 1854dcd8..62739944 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp @@ -350,10 +350,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /* var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDate').val(currDate30); - $('#endDate').val(currDate); + $('#endDate').val(currDate);*/ //处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容 function DoOnCellHtmlData(cell, row, col, data) { diff --git a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp index a0e4cdd6..fdc9ac5b 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorage.jsp @@ -285,10 +285,10 @@ language: "zh-CN" }); - var currDate=getCurrDate(); + /* var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDateTo').val(currDate30); - $('#endDateTo').val(currDate); + $('#endDateTo').val(currDate);*/ //处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容 diff --git a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp index c189c46f..1d695880 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecordStorageDir/MedicalRecordStorageLog.jsp @@ -137,10 +137,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /*var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDate').val(currDate30); - $('#endDate').val(currDate); + $('#endDate').val(currDate);*/ //处理导出内容,这个方法可以自定义某一行、某一列、甚至某个单元格的内容,也就是将其值设置为自己想要的内容 function DoOnCellHtmlData(cell, row, col, data) { diff --git a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp index 71ba19e6..a494d0d6 100644 --- a/src/main/webapp/WEB-INF/views/signListDir/signList.jsp +++ b/src/main/webapp/WEB-INF/views/signListDir/signList.jsp @@ -2180,8 +2180,9 @@ success: function (result) { $('#table').bootstrapTable('refresh'); document.getElementById('archiveIdSign').select(); + setFormToken(); toastr.success(result); - $("#signModal").modal('hide'); + //$("#signModal").modal('hide'); }, error: function () { toastr.error("操作失败!"); } @@ -2271,10 +2272,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /*var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startSignDate').val(currDate30); - $('#endSignDate').val(currDate); + $('#endSignDate').val(currDate);*/ function getFaultType() { $("#faultTypeDiv").empty(); @@ -3985,7 +3986,7 @@ var r=$('#archiveIdSign').val(); $("#archiveMsg").val($('#archiveIdSign').val()); //生成表单token,防止表单重复提交 - setFormToken(); + // setFormToken(); //弹窗是否强制提交 $('#verinfyQZModal').modal({ backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。 diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index 4459bd17..a53bb04f 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -2178,10 +2178,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /*var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDate').val(currDate30); - $('#endDate').val(currDate); + $('#endDate').val(currDate);*/ function getDept() { //获取科室列表 @@ -3815,11 +3815,12 @@ if (row.pdfPath.indexOf(row.assortId + ".pdf") != -1) { $("#upPdfDiv").hide(); //判断该分段类是否存在，如果存在禁止修改，如果不存在则显示可修改项 - if(assortIDFlag!=-1) { - $("#inpType").attr("disabled", "true"); - }else{ + if(assortIDFlag==-1) { toastr.warning("分段类不存在,需修改类!"); } + /*else{ + $("#inpType").attr("disabled", "true"); + }*/ } else { $("#upPdfDiv").show(); $("#inpType").removeAttr("disabled"); @@ -3832,11 +3833,12 @@ $("#addFile").show(); } else { $("#addFile").hide(); - if(assortIDFlag!=-1) { - $("#inpType").attr("disabled", "true"); - }else{ + if(assortIDFlag==-1) { toastr.warning("分段类不存在,需修改类!"); } + /*else{ + $("#inpType").attr("disabled", "true"); + }*/ } diff --git a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp index 65f3cd9d..08f83d39 100644 --- a/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp +++ b/src/main/webapp/WEB-INF/views/vCountDir/vCountList.jsp @@ -171,10 +171,10 @@ format: "yyyy-mm-dd", language: "zh-CN" }); - var currDate=getCurrDate(); + /*var currDate=getCurrDate(); var currDate30=getCurrDay30(); $('#startDate').val(currDate30); - $('#endDate').val(currDate); + $('#endDate').val(currDate);*/ var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");