diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java index 0a4a2317..ffcd3196 100644 --- a/src/main/java/com/emr/controller/beHospitaledController.java +++ b/src/main/java/com/emr/controller/beHospitaledController.java @@ -10,6 +10,7 @@ import com.emr.entity.*; import com.emr.service.*; import com.emr.util.IDHelper; import com.emr.util.ThreadExcelUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.cxf.endpoint.Client; import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; import org.apache.shiro.SecurityUtils; @@ -212,6 +213,10 @@ public class beHospitaledController { if (!flag) { return "请不要重复提交!"; } + Archive_Master archiveMaster1 = archiveMasterService.selectById(emrFaultDetail.getArchiveDetailId()); + if(StringUtils.isNotBlank(archiveMaster1.getArchivestate()) && "初审".equals(archiveMaster1.getArchivestate())){ + return "请不要重复提交!"; + } response.setCharacterEncoding("utf-8"); // 从session获取用户名 Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER"); diff --git a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp index 522501fe..012987a7 100644 --- a/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp +++ b/src/main/webapp/WEB-INF/views/commitDir/commitList.jsp @@ -2301,7 +2301,7 @@ $.ajax({ url: "${path}/beHosp/forceWZ", type: "POST", - data: {archiveDetailId: archiveDetailId, firstTrial: firstTrial, content: content,formToken:$("#formToken").val()}, + data: {archiveDetailId: archiveDetailId, firstTrial: firstTrial, content: content,formToken:$("#formToken1").val()}, success: function (result) { $("#WZModal").modal('hide'); if (result == "1") {