diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java index 3d1551b..457a0dd 100644 --- a/src/main/java/com/emr/controller/FontController.java +++ b/src/main/java/com/emr/controller/FontController.java @@ -345,8 +345,8 @@ public class FontController { * @throws Exception */ @ResponseBody - @RequestMapping(value = "/getPdfToPdf/{masterId}/{detailIds}",method = RequestMethod.POST) - public Msg getPdfToPdf(HttpServletResponse response, @PathVariable("detailIds") String detailIds,HttpSession session){ + @RequestMapping(value = "/getPdfToPdf",method = RequestMethod.POST) + public Msg getPdfToPdf(HttpServletResponse response,String detailIds,HttpSession session){ try { Archive_Detail detail = new Archive_Detail(); detail.setTitle(detailIds); diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 7524cda..edb4017 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -95,6 +95,18 @@ public class beHospitaledController { return role; } + /** + * 加载审核角色 + * @return + */ + @RequestMapping("/getFlowRole") + @ResponseBody + public Msg getFlowRole() throws Exception{ + //查询审核角色集合，根据有效进行计算状态code + List archiveFlowRoles = flowRoleMapper.selectAll(); + return Msg.success().add("list",archiveFlowRoles); + } + @ResponseBody @RequestMapping(value = "/beHospList") public OffsetLimitPage beHospList(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit,Integer isSearch){ diff --git a/src/main/java/com/emr/service/ipml/EnumVerify.java b/src/main/java/com/emr/service/ipml/EnumVerify.java index 9ced380..983087b 100644 --- a/src/main/java/com/emr/service/ipml/EnumVerify.java +++ b/src/main/java/com/emr/service/ipml/EnumVerify.java @@ -104,33 +104,33 @@ public class EnumVerify { String nurseV = ""; if((Checker.Nurse.code != role)){ if(!HasCurrentState(curState, DortorSubmit) && !HasCurrentState(curState, DortorCheck) && !HasCurrentState(curState, DirectorCheck)){ - doctorV += "," + None.name; + doctorV = None.name; } } if((Checker.Dortor.code != role)){ if(!HasCurrentState(curState, NurseSubmit) && !HasCurrentState(curState, NurseCheck)){ - nurseV += "," + None.name; + nurseV = None.name; } } if (HasCurrentState(curState, DortorSubmit) && (Checker.Nurse.code != role)) { - doctorV += ",医生已提交"; + doctorV = "医生已提交"; } if (HasCurrentState(curState, DortorCheck) && (Checker.Nurse.code != role)) { - doctorV += ",医生质控员已质控"; + doctorV = "医生质控员已质控"; } if (HasCurrentState(curState, DirectorCheck) && (Checker.Nurse.code != role)) { - doctorV += ",科主任已质控"; + doctorV = "科主任已质控"; } if (HasCurrentState(curState, NurseSubmit) && (Checker.Dortor.code != role)) { - nurseV += ",护士已提交"; + nurseV = "护士已提交"; } if (HasCurrentState(curState, NurseCheck) && (Checker.Dortor.code != role)) { - nurseV += ",护士质控员已质控"; + nurseV = "护士质控员已质控"; } String tmpV = ""; if (HasCurrentState(curState, DortorBack)) @@ -150,11 +150,7 @@ public class EnumVerify { }else if(Checker.Nurse.code == role){ tmpV = nurseV; }else if(Checker.Generate.code == role){ - if("护士退回".equals(nurseV)){ - tmpV = doctorV + "," + nurseV; - }else{ - tmpV = doctorV + nurseV; - } + tmpV = doctorV + "," + nurseV; } if (HasCurrentState(curState, HeadNurseCheck)) { diff --git a/src/main/resources/config/config.properties b/src/main/resources/config/config.properties index c400a8b..0311676 100644 --- a/src/main/resources/config/config.properties +++ b/src/main/resources/config/config.properties @@ -2,6 +2,9 @@ POWER_IP = 192.168.1.3 POWER_PORT = 8080 +#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 @@ -16,8 +19,9 @@ powerUrl=${POWER_URLHEAD}/font/getMenusByUserIdAndSysFlag #\u6821\u9A8C\u5B8C\u6574\u6027IP CHECKSUCCESS_IP = ${POWER_IP} #\u6821\u9A8C\u5B8C\u6574\u6027\u7AEF\u53E3 -CHECKSUCCESS_PORT = ${POWER_PORT} -HomepageDictionary=http://${CHECKSUCCESS_IP}:${CHECKSUCCESS_PORT}/filing/services/HomepageDictionary?wsdl +CHECKSUCCESS_PORT = 8888 +#CHECKSUCCESS_PORT = ${POWER_PORT} +HomepageDictionary=http://${CHECKSUCCESS_IP}:${CHECKSUCCESS_PORT}/WholeCheckInterface/services/HomepageDictionary?wsdl HomepageMethod=CheckData #webSocket\u670D\u52A1\u5668\u5730\u5740 diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties index 1078a69..998f225 100644 --- a/src/main/resources/config/jdbc.properties +++ b/src/main/resources/config/jdbc.properties @@ -5,6 +5,13 @@ jdbc.password=docus702 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/ArchiveFlowRoleMapper.xml b/src/main/resources/mapper/ArchiveFlowRoleMapper.xml index 817a4ce..799d5b7 100644 --- a/src/main/resources/mapper/ArchiveFlowRoleMapper.xml +++ b/src/main/resources/mapper/ArchiveFlowRoleMapper.xml @@ -116,6 +116,6 @@ \ No newline at end of file diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 12d439f..052081f 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -378,6 +378,11 @@ left join (select master_id from archive_flow_info where start_step_id in(${status}) group by master_id) archive_flow_info on m.id = archive_flow_info.master_id + /**带完整性查询*/ + + INNER JOIN () temp + ON m.id = temp.id + where 1=1 and archive_flow_info.master_id is null diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf index b871c06..34880d3 100644 --- a/src/main/webapp/WEB-INF/jspf/comm.jspf +++ b/src/main/webapp/WEB-INF/jspf/comm.jspf @@ -11,7 +11,7 @@ String now = df.format(d); %> <%----%> - + <%----%> diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index ad163d9..848f269 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -169,6 +169,14 @@ onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')"> +
+ + +
-
- - - - -
+ --%> @@ -656,7 +662,7 @@ - - + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp b/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp index 6a7a35a..4a9b22f 100644 --- a/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp +++ b/src/main/webapp/WEB-INF/views/font/showRecordIframe.jsp @@ -86,7 +86,7 @@
- + diff --git a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp index fb8b907..22db96c 100644 --- a/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp +++ b/src/main/webapp/WEB-INF/views/inHospitalDir/inHositalList.jsp @@ -428,7 +428,7 @@ - + - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 8743f17..2bc10b2 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -604,8 +604,8 @@ - - + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp index 33a47ad..068164d 100644 --- a/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp +++ b/src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp @@ -574,7 +574,7 @@ - - + + \ No newline at end of file diff --git a/src/main/webapp/static/css/comm.css b/src/main/webapp/static/css/comm.css index a8ab035..058b014 100644 --- a/src/main/webapp/static/css/comm.css +++ b/src/main/webapp/static/css/comm.css @@ -203,3 +203,11 @@ body { .img { cursor: pointer; } +/** +模态框关闭按钮 + */ +.close{ + color: red!important; + font-size: 28px!important; + opacity: 1!important; +} diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index f83a148..d9edc16 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -228,7 +228,7 @@ function initTable() { show: true//弹出对话框 }); var masterId = row.id; - var name = row.name; + var name = encodeURI(row.name); var inpNo = row.inpNo; var visitId = row.visitId; var dischargeDateTime = row.dischargeDateTime; @@ -389,7 +389,7 @@ function paramsMatter(value, row) { if(value == null){ value = ''; } - value = ''; + value = '

'+result+value+'

'; return value; } @@ -636,18 +636,60 @@ $("#getRecallBtn").on('click', function () { function getCurrentCodes() { //只做一次查询赋值 if($("#currentRoleIds").val() == ''){ + $.ajaxSettings.async = false; $.get(path+"/beHosp/getCurrentCodes",function(data){ $("#currentRole").val(data.code); $("#currentRoleIds").val(data.msg); },'json') + $.ajaxSettings.async = true; } } +//加载审核节点 +function getApproveRoles() { + //只做一次查询赋值 + $.get(path+"/beHosp/getFlowRole",function(data){ + if(data.code == 100){ + var flowRoles = data.extend.list; + if(null != flowRoles && flowRoles != ''){ + var html = ''; + //获取拥有角色 + var currentRoleIds = $("#currentRoleIds").val(); + //获取操作角色 + var checker = $("#checker").val(); + for (var i = 0; i < flowRoles.length; i++) { + var code = flowRoles[i].code; + //过滤病案室审核128和病案室召回1024且无效的对象 + if(code != '128' && code != '1024' && flowRoles[i].effective == 1){ + if(code <= 64 && code >= 2 && checker != 4){ + if(currentRoleIds != '' && currentRoleIds > flowRoles[i].id && checker == flowRoles[i].role){ + html += ''; + } + }else{ + if(checker != 4 && flowRoles[i].role != null){ + if(checker == flowRoles[i].role){ + html += ''; + } + }else{ + html += ''; + } + } + } + } + $("#approveRole").append(html); + } + }else{ + toastr.error(data.msg); + } + },'json') +} $(function () { //赋值审核角色 getChecker(); //加载当前角色 getCurrentCodes(); + //加载审核节点 + //getApproveRoles(); var url = window.location.href; var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", ""); if (index != null && index != "" && index.indexOf("excel") != -1) { diff --git a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js index ea4aefc..a4edb2f 100644 --- a/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js +++ b/src/main/webapp/static/js/hospitalCommom/hospitalCommom.js @@ -833,6 +833,12 @@ $(document).keydown(function (event) { searchNode(); } }); +//按esc关闭病历清单 +$(document).keydown(function (event) { + if (event.keyCode == 27){//点击“ESC”键 + $("#selModal").modal('hide'); + } +}); //展开 function expandAll() { diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js index beb5684..c9318da 100644 --- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js +++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js @@ -253,7 +253,7 @@ function initTable() { show: true//弹出对话框 }); var masterId = row.id; - var name = row.name; + var name = encodeURI(row.name); var inpNo = row.inpNo; var visitId = row.visitId; var dischargeDateTime = row.dischargeDateTime; diff --git a/src/main/webapp/static/js/showRecord/showRecordIframe.js b/src/main/webapp/static/js/showRecord/showRecordIframe.js index 685cf92..87ee514 100644 --- a/src/main/webapp/static/js/showRecord/showRecordIframe.js +++ b/src/main/webapp/static/js/showRecord/showRecordIframe.js @@ -90,15 +90,12 @@ function onClick(e, treeId, treeNode) { }; //加载pdfan按钮功能 function onloadPdf(){ - var patientId = parent.$("#patientId").val(); var detailIds = $("#detailIds").val(); - var url = path+"/font/getPdfToPdf/"+patientId+"/"+detailIds; - var pdfUrl = path+"/static/pdfjs/web/viewer.html?file="+url; - $("#iframe1").attr("src",pdfUrl); - $("#iframe1").css("height",$("body")[0].offsetHeight) - /*$.ajax({ + var url = path+"/font/getPdfToPdf"; + $.ajax({ type:'post', url:url, + data:{detailIds:detailIds}, success:function(data){ if(data.code == 100){ var pdfUrl = path+"/static/pdfjs/web/viewer.html?file="+path+"/font/showPdf"; @@ -108,7 +105,7 @@ function onloadPdf(){ toastr.error(data.msg); } } - })*/ + }) /*$("#iframe1").attr("src",path+"/static/pdfjs/web/viewer.html?file="+path+"/font/getPdfToPdf/"+patientId+"/"+detailIds);*/ } diff --git a/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js b/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js index 3a3490a..9247be5 100644 --- a/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js +++ b/src/main/webapp/static/js/unfileMedicalList/unfileMedicalList.js @@ -274,7 +274,7 @@ function initTable() { show: true//弹出对话框 }); var masterId = row.id; - var name = row.name; + var name = encodeURI(row.name); var inpNo = row.inpNo; var visitId = row.visitId; var dischargeDateTime = row.dischargeDateTime;