第三方病案浏览post请求,修改模态框关闭按钮样式,出院浏览审核状态显示最高审核

master
zengwh 5 years ago
parent 243aafdcf4
commit 81afbbf9f8

@ -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);

@ -95,6 +95,18 @@ public class beHospitaledController {
return role;
}
/**
*
* @return
*/
@RequestMapping("/getFlowRole")
@ResponseBody
public Msg getFlowRole() throws Exception{
//查询审核角色集合根据有效进行计算状态code
List<ArchiveFlowRole> 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){

@ -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))
{

@ -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

@ -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

@ -116,6 +116,6 @@
</update>
<!--查询全部-->
<select id="selectAll" resultMap="BaseResultMap">
SELECT * FROM archive_flow_role ORDER BY role,step_index
SELECT * FROM archive_flow_role ORDER BY role,id
</select>
</mapper>

@ -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
/**带完整性查询*/
<if test="isSuccess != null and isSuccess != ''">
INNER JOIN (<include refid="searchSuccessForMasterIdList"></include>) temp
ON m.id = temp.id
</if>
where 1=1 and archive_flow_info.master_id is null
<include refid="beHospitalSeach"></include>
</if>

@ -11,7 +11,7 @@
String now = df.format(d);
%>
<%--<!-- jquery -->--%>
<link rel="stylesheet" href="${path}/static/css/comm.css?t=2020-08-28"/>
<link rel="stylesheet" href="${path}/static/css/comm.css?t=2020-09-04"/>
<%--<!-- 引入bootstrap样式 -->--%>
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/css/bootstrap.min.css"/>
<link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css?t=2020-08-18"/>

@ -169,6 +169,14 @@
onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startDateTo','endDateTo','table')">
</select>
</div>
<div class="form-group divCss">
<label>是否完整:</label>
<select class="input-sm form-control" id="isSuccessSearch">
<option value="">全部</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
<div class="form-group divCss">
<label>审核状态:</label>
<select class="input-sm form-control" id="archivestate1">
@ -177,14 +185,12 @@
<option value="1">已审核</option>
</select>
</div>
<div class="form-group divCss">
<label>是否完整:</label>
<select class="input-sm form-control" id="isSuccessSearch">
<%--<div class="form-group divCss">
<label>审核节点:</label>
<select class="input-sm form-control" id="approveRole">
<option value="">全部</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
</div>--%>
<button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
<button type="button" class="btn btn-primary btn-sm divCss" id="approvesBtn">批量审核</button>
@ -656,7 +662,7 @@
</div>
</div>
</body>
<script src="${path}/static/js/beHospList/beHospList.js?time=2020-08-26"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-08-21"></script>
<script src="${path}/static/js/beHospList/beHospList.js?time=2020-09-04"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-04"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
</html>

@ -86,7 +86,7 @@
<div class="content-right">
<iframe width="100%" src="" id="iframe1" frameborder="0" scrolling="yes"></iframe>
</div>
<script type="text/javascript" src="${path}/static/js/showRecord/showRecordIframe.js?time=2020-08-21"></script>
<script type="text/javascript" src="${path}/static/js/showRecord/showRecordIframe.js?time=2020-09-04"></script>
<script type="text/javascript" src="${path}/static/js/showRecord/showRecordIframeCommom.js"></script>
</body>
</html>

@ -428,7 +428,7 @@
<script type="text/javascript">
var path = "${path}";
</script>
<script src="${path}/static/js/inHospList/inHospList.js?time=2020-08-21"></script>
<script src="${path}/static/js/inHospList/inHospList.js?time=2020-09-04"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-08-21"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-04"></script>
</html>

@ -604,8 +604,8 @@
</div>
</div>
</body>
<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-09-02"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-08-21"></script>
<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-09-04"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-04"></script>
<script src="${path}/static/js/statistics/getDeptCommom.js"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
</html>

@ -574,7 +574,7 @@
<script type="text/javascript">
var path = "${path}";
</script>
<script src="${path}/static/js/unfileMedicalList/unfileMedicalList.js?time=2020-08-18"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-08-21"></script>
<script src="${path}/static/js/unfileMedicalList/unfileMedicalList.js?time=2020-09-04"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-04"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>
</html>

@ -203,3 +203,11 @@ body {
.img {
cursor: pointer;
}
/**
*/
.close{
color: red!important;
font-size: 28px!important;
opacity: 1!important;
}

@ -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 = '<p class="hidden-xs" title="'+value+'">'+result+value+'</p>';
value = '<p title="'+value+'">'+result+value+'</p>';
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 += '<option value="'+code+'">'+flowRoles[i].name+'</option>';
}
}else{
if(checker != 4 && flowRoles[i].role != null){
if(checker == flowRoles[i].role){
html += '<option value="'+code+'">'+flowRoles[i].name+'</option>';
}
}else{
html += '<option value="'+code+'">'+flowRoles[i].name+'</option>';
}
}
}
}
$("#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) {

@ -833,6 +833,12 @@ $(document).keydown(function (event) {
searchNode();
}
});
//按esc关闭病历清单
$(document).keydown(function (event) {
if (event.keyCode == 27){//点击“ESC”键
$("#selModal").modal('hide');
}
});
//展开
function expandAll() {

@ -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;

@ -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);*/
}

@ -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;

Loading…
Cancel
Save