diff --git a/src/main/java/com/emr/controller/lastVerifyController.java b/src/main/java/com/emr/controller/lastVerifyController.java index e280e093..4c4a3ea1 100644 --- a/src/main/java/com/emr/controller/lastVerifyController.java +++ b/src/main/java/com/emr/controller/lastVerifyController.java @@ -8,6 +8,7 @@ package com.emr.controller; import com.emr.entity.*; import com.emr.service.*; +import com.emr.util.Msg; import com.emr.util.ThreadExcelUtils; import com.emr.util.XMLUtil; import com.emr.webservice.MedicalRecordShowBackContent.MR_FILE_CALLBACK_RECORD; @@ -213,10 +214,10 @@ public class lastVerifyController { @Transactional @ResponseBody @RequestMapping(value = "/updateStateByArchivId") - public String updateStateByArchivId(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail emrFaultDetail) throws UnsupportedEncodingException { + public Msg updateStateByArchivId(HttpServletRequest request, HttpServletResponse response, Emr_Fault_Detail emrFaultDetail) throws UnsupportedEncodingException { boolean flag = FormTokenFlagUtil.isFlag(request); if (!flag) { - return "请不要重复提交!"; + return Msg.fail("请不要重复提交!"); } String inpatientNo = emrFaultDetail.getContent(); if(StringUtils.isBlank(inpatientNo)){ @@ -253,10 +254,10 @@ public class lastVerifyController { if(list.size()>0){ bol = emrFaultDetailService.delbyCol(emrFaultDetail); if(bol==1){ - bol = emrFaultDetailService.insertSel(emrFaultDetail); + emrFaultDetailService.insertSel(emrFaultDetail); } }else{ - bol = emrFaultDetailService.insertSel(emrFaultDetail); + emrFaultDetailService.insertSel(emrFaultDetail); } //获取留观标识,“LG” String lgFlag = inpatientNo.substring(0,2); @@ -276,7 +277,7 @@ public class lastVerifyController { archiveMasterService.requestObservationRecord(inpatientNo,"AUDITED",null); } } - return bol + ""; + return Msg.success(); } @ResponseBody @@ -338,7 +339,6 @@ public class lastVerifyController { } else { result = "该份病案签收失败!"; } - }else{ if(isSign==1) { result = "该份病案已经签收!"; diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 9934da97..c2fb1992 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -2403,13 +2403,13 @@ data: {archiveDetailId: archiveDetailId, firstTrial: firstTrial, state: state,content:$("#inpatientNo").val(), formToken: $("#formToken").val()}, success: function (result) { - if(result == '1') { + if(result.code == 100) { $("#verifyModal").modal('hide'); var tableId = $("#tableId").val(); toastr.success("终审操作成功!"); $("#" + tableId).bootstrapTable("refresh"); }else{ - toastr.error(result); + toastr.error(result.msg); } } });