更新去除留观不用分模块退回

src/main/java/com/emr/controller/lastVerifyController.java

@@ -120,10 +120,15 @@ public class lastVerifyController {
        //修改病案归档状态：复审退回或主任退回
         Archive_Master archiveMaster = archiveMasterService.selectById(emrFaultDetail.getArchiveDetailId());
         if(archiveMaster!=null) {
+            String inpatientNo = archiveMaster.getInpNo();
+            //获取留观标识，“LG”
+            String lgFlag = inpatientNo.substring(0,2);
             //退回给emr
-            String result = archiveMasterService.returnEmr(emrFaultDetail, archiveMaster, request);
-            if(StringUtils.isNotBlank(result)){
-                return result;
+            if(!"LG".equals(lgFlag)) {
+                String result = archiveMasterService.returnEmr(emrFaultDetail, archiveMaster, request);
+                if (StringUtils.isNotBlank(result)) {
+                    return result;
+                }
             }
             archiveMaster.setArchivestate(emrFaultDetail.getState());
             //查询该病案号缺陷，如果有医生就退回医生如果有护士则退回护士否则不退回提示
@@ -192,9 +197,6 @@ public class lastVerifyController {
                     archiveMaster.setCmtNurse(1);
                 }
                 bol = archiveMasterService.updateByClo(archiveMaster);
-                String inpatientNo = archiveMaster.getInpNo();
-                //获取留观标识，“LG”
-                String lgFlag = inpatientNo.substring(0,2);
                 if(!"LG".equals(lgFlag)) {
                     if (emrFaultDetail.getState().equals("复审退回")) {
                         //2021-01-30 following表中添加病案室退回操作记录

src/main/java/com/emr/controller/pdfController.java

@@ -6,7 +6,10 @@
  */
 package com.emr.controller;
 
+import com.emr.dao.Archive_MasterMapper;
+import com.emr.entity.Archive_Master;
 import com.emr.entity.Emr_Fault_Detail;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,7 +20,8 @@ import javax.servlet.http.HttpServletResponse;
 @Controller
 @RequestMapping("pdfCtr")
 public class pdfController {
-
+    @Autowired
+    private Archive_MasterMapper archiveMasterMapper;
     @RequestMapping(value = "/pdfDir")
     public String pdfDir(HttpServletRequest req, Emr_Fault_Detail emrFaultDetail) {
         String archiveDetailId= emrFaultDetail.getArchiveDetailId();
@@ -31,7 +35,10 @@ public class pdfController {
     @RequestMapping(value = "/pdfLastDir")
     public String pdfLastDir(HttpServletRequest req, Emr_Fault_Detail emrFaultDetail) {
         String archiveDetailId = emrFaultDetail.getArchiveDetailId();
+        //根据masterId查看master
+        Archive_Master archiveMaster = archiveMasterMapper.selectById(archiveDetailId);
         //req.setAttribute("aa", "cccc");
+        req.setAttribute("inpNo", archiveMaster.getInpNo());
         req.setAttribute("archiveDetailId", archiveDetailId);
         req.setAttribute("type", req.getAttribute("type"));
         //req.setAttribute("roleVal","1"+ emrFaultDetail.getBackFlag());

src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp

@@ -299,25 +299,27 @@
                             <span style="vertical-align:top;">内容：</span>
                             <textarea id="backContentLast" rows="9" style="width:85%;"></textarea>
                         </div>
-                        <div class="row divCss2">
-                            <div class="spanDiv">
-                                <span>请选择电子病历可修改部分：</span>
-                            </div>
-                            <div class="contentDiv" id="returnFlagDiv">
-                                <select class="selectpicker bla bla bli" multiple data-live-search="true" id="returnFlag"
-                                        data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" title="请选择可修改部分">
-                                    <%--<option value="0">打回首页</option>--%>
-                                    <option value="1">打回医生</option>
-                                    <option value="2">打回护士</option>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="row divCss2">
-                            <div class="spanDiv">
-                                <span>退回电子病历原因：</span>
+                        <div style="display:<c:if test="${inpNo.indexOf('LG') > -1}">none</c:if>">
+                            <div class="row divCss2">
+                                <div class="spanDiv">
+                                    <span>请选择电子病历可修改部分：</span>
+                                </div>
+                                <div class="contentDiv" id="returnFlagDiv">
+                                    <select class="selectpicker bla bla bli" multiple data-live-search="true" id="returnFlag"
+                                            data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" title="请选择可修改部分">
+                                        <%--<option value="0">打回首页</option>--%>
+                                        <option value="1">打回医生</option>
+                                        <option value="2">打回护士</option>
+                                    </select>
+                                </div>
                             </div>
-                            <div class="contentDiv">
-                                <textarea id="retrunContent" rows="3" style="width: 88%;" maxlength="128"></textarea>
+                            <div class="row divCss2">
+                                <div class="spanDiv">
+                                    <span>退回电子病历原因：</span>
+                                </div>
+                                <div class="contentDiv">
+                                    <textarea id="retrunContent" rows="3" style="width: 88%;" maxlength="128"></textarea>
+                                </div>
                             </div>
                         </div>
                     </div>