diff --git a/src/main/java/com/emr/controller/MedicalRecallController.java b/src/main/java/com/emr/controller/MedicalRecallController.java index 5f013d5..c0b961b 100644 --- a/src/main/java/com/emr/controller/MedicalRecallController.java +++ b/src/main/java/com/emr/controller/MedicalRecallController.java @@ -68,8 +68,8 @@ public class MedicalRecallController { @ResponseBody @RequestMapping(value = "/exportExcel") public void exportExcel(HttpServletResponse response, Archive_Master_Vo master){ - String tableThNames = "住院号,住院次数,名字,性别,入院科室,入院日期,出院科室,出院日期,上次召回状态,归档状态"; - String fieldCns = "inpNo,visitId,name,sex,deptAdmissionTo,admissionDateTime,deptName,dischargeDateTime,status,archivestate"; + String tableThNames = "住院号,住院次数,名字,性别,入院科室,入院日期,出院科室,出院日期,上次召回状态,归档状态,终审工号"; + String fieldCns = "inpNo,visitId,name,sex,deptAdmissionTo,admissionDateTime,deptName,dischargeDateTime,status,archivestate,checkedDoctor"; try { List list = archiveMasterMapper.selectFiled(master); //文件名 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 5f6e793..a50276c 100644 --- a/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_DetailServiceImpl.java @@ -211,8 +211,8 @@ public class Archive_DetailServiceImpl implements Archive_DetailService { StringBuilder idsStr = new StringBuilder(); //组织已经扫描上传的MasterId List list = archiveDetailMapper.selectIsScan(ids); + ids = ""; if(!CollectionUtils.isEmpty(list)){ - ids = ""; for (Archive_Detail obj: list ) { String masterid = obj.getMasterid(); if(StringUtils.isBlank(idsStr)){ 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 f541780..a416a53 100644 --- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java +++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java @@ -204,12 +204,12 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { StringBuilder patientIdStr = new StringBuilder(); for (Archive_Master_Vo masterVo : list) { //状态均为护士长已质控,取出一个对象,转换中文状态 - /*Integer status = Integer.valueOf(masterVo.getArchivestate()); + Integer status = Integer.valueOf(masterVo.getArchivestate()); if(status.equals(EnumVerify.DocState.HeadNurseCheck.getCode())){ masterVo.setStatus(EnumVerify.DocState.HeadNurseCheck.getName()); }else if(status.equals(EnumVerify.DocState.CallBacked.getCode())){ masterVo.setStatus(EnumVerify.DocState.CallBacked.getName()); - }*/ + } //组织记帐号集合 if(StringUtils.isNotBlank(masterVo.getPatientId())) { if (StringUtils.isNotBlank(patientIdStr)) { @@ -227,14 +227,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService { //执行查询 List selectList = OracleConnect.selectList(sql); for (Archive_Master_Vo masterVo : list) { - masterVo.setStatus("未签收"); + masterVo.setRemark("未签收"); //赋值 if(!CollectionUtils.isEmpty(selectList)){ String patientId = masterVo.getPatientId(); if(StringUtils.isNotBlank(patientId)) { for (String str : selectList) { if(str.equals(patientId)){ - masterVo.setStatus("已签收"); + masterVo.setRemark("已签收"); break; } } diff --git a/src/main/java/com/emr/vo/TUuPrintSearch.java b/src/main/java/com/emr/vo/TUuPrintSearch.java index a25be78..4751064 100644 --- a/src/main/java/com/emr/vo/TUuPrintSearch.java +++ b/src/main/java/com/emr/vo/TUuPrintSearch.java @@ -23,5 +23,7 @@ public class TUuPrintSearch { private String name; private String sql; + + private String inpNo; } diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index 0a0f6ca..fc44bd4 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -1,9 +1,9 @@ #power\u6743\u9650\u7CFB\u7EDFIP\u548C\u7AEF\u53E3 -POWER_IP = localhost -POWER_PORT = 8080 +#POWER_IP = localhost +#POWER_PORT = 8080 -#POWER_IP = 200.100.104.40 -#POWER_PORT = 8081 +POWER_IP = 200.100.104.40 +POWER_PORT = 8081 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934 POWER_URLHEAD = http://${POWER_IP}:${POWER_PORT}/power @@ -20,8 +20,8 @@ powerUrl=${POWER_URLHEAD}/font/getMenusByUserIdAndSysFlag #CHECKSUCCESS_IP = 200.100.104.40 CHECKSUCCESS_IP = ${POWER_IP} #\u6821\u9A8C\u5B8C\u6574\u6027\u7AEF\u53E3 -CHECKSUCCESS_PORT = 8081 -#CHECKSUCCESS_PORT = ${POWER_PORT} +#CHECKSUCCESS_PORT = 8081 +CHECKSUCCESS_PORT = ${POWER_PORT} HomepageDictionary=http://${CHECKSUCCESS_IP}:${CHECKSUCCESS_PORT}/WholeCheckInterface/services/HomepageDictionary?wsdl HomepageMethod=CheckData @@ -40,7 +40,7 @@ recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863 pdfWater = \u4F5B\u5C71\u5E02\u9AD8\u660E\u4EBA\u6C11\u533B\u9662 #\u672C\u5730\u56FE\u7247\u5730\u5740 -pictureUrl=D:\\JiaShiPic\\ +pictureUrl=C:\\JiaShiPic\\ #\u6620\u5C04\u672C\u5730\u56FE\u7247\u5730\u5740\u6839\u76EE\u5F55 picSrc=upload\\ diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 998f225..cb6c173 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -1,17 +1,14 @@ jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver -jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=gm_record +#jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=gm_record +#jdbc.username=sa +#jdbc.password=docus702 + +jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=emr_record jdbc.username=sa -jdbc.password=docus702 +jdbc.password=AbcXyz123 filters=stat maxWait=60000 -#jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver -#jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=emr_record -#jdbc.username=sa -#jdbc.password=AbcXyz123 -#filters=stat -#maxWait=60000 - diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 2ed506a..456ce8c 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -527,6 +527,7 @@ f. NAME dept_name, archive_master.discharge_date_time, archive_master.checked_datetime, + archive_master.checked_doctor, CASE WHEN archive_callback_info.count = NULL OR archive_callback_info.count = 0 THEN @@ -597,6 +598,9 @@ + + and archive_master.checked_doctor like '%'+#{checkedDoctor,jdbcType=NVARCHAR}+'%' + ORDER BY archive_master.checked_datetime DESC diff --git a/src/main/resources/mapper/TUuInfoMapper.xml b/src/main/resources/mapper/TUuInfoMapper.xml index c25afdb..78228ca 100644 --- a/src/main/resources/mapper/TUuInfoMapper.xml +++ b/src/main/resources/mapper/TUuInfoMapper.xml @@ -192,6 +192,9 @@ AND uuName LIKE '%${name}%' + + AND inp_no LIKE '%${inpNo}%' + AND UpLoadDateTime between '${startDate} 00:00:00' and '${endDate} 23:59:59' diff --git a/src/main/resources/mapper/TUuPrintMapper.xml b/src/main/resources/mapper/TUuPrintMapper.xml index 6652344..b89be92 100644 --- a/src/main/resources/mapper/TUuPrintMapper.xml +++ b/src/main/resources/mapper/TUuPrintMapper.xml @@ -134,6 +134,9 @@ AND cpyUser LIKE '%${name}%' + + AND inp_no LIKE '%${inpNo}%' + AND cpytime between '${startDate} 00:00:00' and '${endDate} 23:59:59' @@ -183,6 +186,9 @@ AND cpyUser LIKE '%${name}%' + + AND inp_no LIKE '%${inpNo}%' + AND cpytime between '${startDate} 00:00:00' and '${endDate} 23:59:59' diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 5e10750..d00d391 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -585,6 +585,30 @@ +<%--单个审核弹窗未扫描纸质病历弹窗提示--%> + <%--审核确认弹窗--%> - + diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp index 7f7c20c..c2265aa 100644 --- a/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp +++ b/src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp @@ -86,7 +86,7 @@ --%>
- +
+
+ + +
@@ -234,5 +238,5 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/statistics/printCount.jsp b/src/main/webapp/WEB-INF/views/statistics/printCount.jsp index f016eb4..47e1baf 100644 --- a/src/main/webapp/WEB-INF/views/statistics/printCount.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/printCount.jsp @@ -62,6 +62,10 @@ onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')"> +
+ + +
@@ -93,7 +97,7 @@
- + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp b/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp index 2dc07ca..3c2b16c 100644 --- a/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/printInfo.jsp @@ -62,6 +62,10 @@ onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')"> +
+ + +
@@ -93,7 +97,7 @@
- + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp b/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp index 8b61af8..2f1f36c 100644 --- a/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp +++ b/src/main/webapp/WEB-INF/views/statistics/scanInfo.jsp @@ -62,6 +62,10 @@ onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')"> +
+ + +
@@ -93,7 +97,7 @@
- + \ No newline at end of file diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js index 316f134..ae2678c 100644 --- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js +++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js @@ -131,16 +131,25 @@ function initTable() { align: 'left' }, { - title: '纸质状态', + title: '状态', field: 'status', align: 'center', - valign: 'middle', formatter: function (value, row) { var overTimeStr = ''; //超期 if (row.days > 0) { overTimeStr = '(超期)'; } + var str = '' + value + ''; + return overTimeStr+str; + } + }, + { + title: '纸质状态', + field: 'remark', + align: 'center', + valign: 'middle', + formatter: function (value, row) { var colorStr = '' if(value == '已签收'){ colorStr = '#8FBC8F'; @@ -150,7 +159,7 @@ function initTable() { value = ''; } var str = '' + value + ''; - return overTimeStr+str; + return str; } }, { @@ -368,10 +377,39 @@ $("#verifyBtn").on('click', function () { }); }else{ //只有一个直接提交 - approveMethod(); + var ids = $("#archiveId").val(); + //判断是否有扫描纸质 + $.ajax({ + type:'get', + url:path+'/lastVerify/selectIsScan', + data:{ids:ids}, + dataType:'json', + success:function(data){ + if(data.code == 100){ + var str = data.extend.ids; + if(str != ''){ + //允许提交 + approveMethod(); + }else{ + //弹窗确认 + $("#WZModal").modal({show:"true"}); + } + //隐藏该窗口 + $("#verifyModal").modal('hide'); + }else{ + toastr.error(data.msg); + } + } + }) } }); +//单个终审判断纸质未扫描仍强制提交 +$("#wzSaveBtn").click(function(){ + approveMethod(); + $("#WZModal").modal('hide'); +}) + //终审方法 function approveMethod(){ setFormToken(); @@ -420,45 +458,15 @@ $("#sureBtn").on('click',function(){ //调用审批diag function callApproveDiag(ids,count) { - //判断是否有扫描纸质 - $.ajax({ - type:'get', - url:path+'/lastVerify/selectIsScan', - data:{ids:ids}, - dataType:'json', - success:function(data){ - if(data.code == 100){ - var ids = data.extend.ids; - if(ids != ''){ - $('#verifyModal').modal({ - backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。 - keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。 - show: true//弹出对话框 - }); - $("#archiveId").val(ids); - $("#status1").val("64"); - $("#verifyText").val(""); - //审批个数 - //组织selects - debugger - var idsList = ids.split(","); - for (var i = 0; i < selects.length; i++) { - for (var j = 0; j < idsList.length; j++) { - if(selects[i].id == idsList[j]){ - return ; - } - } - selects.splice(i,1); - } - $("#approveCount").val(idsList.length); - }else{ - toastr.warning("纸质病历未扫描上传,请先扫描上传") - } - }else{ - toastr.error(data.msg); - } - } - }) + $('#verifyModal').modal({ + backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。 + keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。 + show: true//弹出对话框 + }); + $("#archiveId").val(ids); + $("#status1").val("64"); + $("#verifyText").val(""); + $("#approveCount").val(count); } //查看初审信息 diff --git a/src/main/webapp/static/js/medicalRecallList/medicalRecallList.js b/src/main/webapp/static/js/medicalRecallList/medicalRecallList.js index d33fec1..65e60c5 100644 --- a/src/main/webapp/static/js/medicalRecallList/medicalRecallList.js +++ b/src/main/webapp/static/js/medicalRecallList/medicalRecallList.js @@ -88,7 +88,8 @@ function initTable() { name:""+$("#name").val(), //archivestate: "" + $("#archivestate").val(), status:"" + $("#state").val(), - deptName: deptName.toString() + deptName: deptName.toString(), + checkedDoctor:$("#checkedDoctor").val() }; return temp; }, @@ -199,6 +200,12 @@ function initTable() { return '已归档'; } }, + { + title: '终审工号', + field: 'checkedDoctor', + align: 'center', + valign: 'middle' + }, { title: "操作", align: 'left', @@ -336,6 +343,7 @@ $("#excelBtn").click(function () { var name = $("#name").val(); var idNo = $("#idNo").val(); var status = $("#state").val(); + var checkedDoctor = $("#checkedDoctor").val(); //var archivestate=""+ $("#archivestate").val(); var url = window.location.href; @@ -348,7 +356,7 @@ $("#excelBtn").click(function () { } } var url = path+"/medicalRecall/exportExcel"; - post(url,{"inpNo":inpNo,"visitId":visitId,"name":name,"idNo":idNo,"deptName":deptName,"status":status}); + post(url,{"inpNo":inpNo,"visitId":visitId,"name":name,"idNo":idNo,"deptName":deptName,"status":status,"checkedDoctor":checkedDoctor}); }); //召回提交 diff --git a/src/main/webapp/static/js/statistics/printCount.js b/src/main/webapp/static/js/statistics/printCount.js index afc9202..c524440 100644 --- a/src/main/webapp/static/js/statistics/printCount.js +++ b/src/main/webapp/static/js/statistics/printCount.js @@ -56,7 +56,8 @@ function initTable() { startDate: $("#startTime1").val(), endDate: $("#endTime1").val(), name:$("#name").val(), - isSearch:$("#isSearch").val() + isSearch:$("#isSearch").val(), + inpNo:$("#inpNo").val() }; return temp; }, @@ -149,6 +150,7 @@ $("#excelBtn").click(function () { "endDate": $("#endTime1").val(), "name":$("#name").val(), "isSearch":$("#isSearch").val(), - "sql":sql + "sql":sql, + "inpNo":$("#inpNo").val() }); }); \ No newline at end of file diff --git a/src/main/webapp/static/js/statistics/printInfo.js b/src/main/webapp/static/js/statistics/printInfo.js index d153d8b..667f3e8 100644 --- a/src/main/webapp/static/js/statistics/printInfo.js +++ b/src/main/webapp/static/js/statistics/printInfo.js @@ -56,7 +56,8 @@ function initTable() { startDate: $("#startTime1").val(), endDate: $("#endTime1").val(), name:$("#name").val(), - isSearch:$("#isSearch").val() + isSearch:$("#isSearch").val(), + inpNo:$("#inpNo").val() }; return temp; }, @@ -185,6 +186,7 @@ $("#excelBtn").click(function () { "endDate": $("#endTime1").val(), "name":$("#name").val(), "isSearch":$("#isSearch").val(), - "sql":sql + "sql":sql, + "inpNo":$("#inpNo").val() }); }); \ No newline at end of file diff --git a/src/main/webapp/static/js/statistics/scanInfo.js b/src/main/webapp/static/js/statistics/scanInfo.js index 600aafa..39f305b 100644 --- a/src/main/webapp/static/js/statistics/scanInfo.js +++ b/src/main/webapp/static/js/statistics/scanInfo.js @@ -57,6 +57,7 @@ function initTable() { endDate: $("#endTime1").val(), name:$("#name").val(), isSearch:$("#isSearch").val(), + inpNo:$("#inpNo").val() }; return temp; }, @@ -173,6 +174,7 @@ $("#excelBtn").click(function () { "endDate": $("#endTime1").val(), "name":$("#name").val(), "isSearch":$("#isSearch").val(), - "sql":sql + "sql":sql, + "inpNo":$("#inpNo").val() }); }); \ No newline at end of file