开发借阅统计报表

src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java

@@ -21,13 +21,13 @@ import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.util.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.servlet.http.HttpServletRequest;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -37,6 +37,8 @@ import java.util.*;
 @Service
 @Transactional
 public class Archive_MasterServiceImpl implements Archive_MasterService {
+    @Value("${notJudgeTasks}")
+    private String notJudgeTasks;
     private static Logger log = Logger.getLogger("myLog");
     @Autowired
     private Archive_MasterMapper archiveMasterMapper;
@@ -1372,16 +1374,20 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                         }
                     }
                     if(!complete){
-                        //不完整添加进提示语句
-                        if(StringUtils.isNotBlank(failResult)){
-                            failResult.append(",");
+                        //最终判断是否添加进校验提示名单
+                        if(judgeIsNotJudgeTask(showName)) {
+                            //不完整添加进提示语句
+                            if(StringUtils.isNotBlank(failResult)){
+                                failResult.append(",");
+                            }
+                            failResult.append(showName);
                         }
-                        failResult.append(showName);
                     }
                 }
             }
         } catch (Exception e) {
             e.printStackTrace();
+            return Msg.fail("请求护理文书平台失败");
         }
         //判断电子病历是否完成sysFlag = 2
         //查询电子病历采集任务
@@ -1423,16 +1429,21 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
                         }
                     }
                     if(!complete){
-                        //不完整添加进提示语句
-                        if(StringUtils.isNotBlank(failResult)){
-                            failResult.append(",");
+                        String fentryName = (String)map1.get("FENTRY_NAME");
+                        //最终判断是否添加进校验提示名单
+                        if(judgeIsNotJudgeTask(fentryName)) {
+                            //不完整添加进提示语句
+                            if(StringUtils.isNotBlank(failResult)){
+                                failResult.append(",");
+                            }
+                            failResult.append(fentryName);
                         }
-                        failResult.append(map1.get("FENTRY_NAME"));
                     }
                 }
             }
         } catch (Exception e) {
             e.printStackTrace();
+            return Msg.fail("请求电子病历平台失败");
         }
         if(StringUtils.isNotBlank(failResult)){
             failResult.append("采集未完成不允许提交");
@@ -1440,6 +1451,23 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         }
         return Msg.success();
     }
+
+    /**
+     * 判断是否需要添加进校验提示名单
+     * @param task
+     * @return
+     */
+    private boolean judgeIsNotJudgeTask(String task){
+        if(StringUtils.isNotBlank(task) && StringUtils.isNotBlank(notJudgeTasks)){
+            String[] tasks = notJudgeTasks.split(",");
+            for(String taskTemp : tasks){
+                if(taskTemp.equals(task)){
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
 }
 
 

src/main/java/com/emr/util/OracleConnect.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.alibaba.druid.pool.DruidDataSource;
+import org.springframework.beans.factory.annotation.Value;
 
 /**
  * Oracle链接数据库对象
@@ -20,12 +21,9 @@ public class OracleConnect {
     private static PreparedStatement pst = null;
     public static ResultSet rs = null;
 
-//    private String url = "127.0.0.1:1521/ORCL";
-//    private String userName = "docus";
-//    private String passWord = "docus702";
-    private String url = "200.100.100.1:1521/orc1";
-    private String userName = "Jswzh";
-    private String passWord = "Jswzh";
+    private String url = PropertiesUtils.getProperty("oracleUrl");
+    private String userName = PropertiesUtils.getProperty("oracleUserName");
+    private String passWord = PropertiesUtils.getProperty("oraclePassWord");
     /**
      * 构造函数完成数据库的连接和连接对象的生成
      */

src/main/resources/config/config.properties

@@ -55,3 +55,15 @@ overDateSet = 2021-05-01
 
 #\u5404\u5BA1\u6838\u89D2\u8272\u7528\u6237id 1\uFF1A\u533B\u751F\uFF1B2\uFF1A\u62A4\u58EB\uFF1B3\uFF1A\u75C5\u6848\u5BA4\u4EBA\u5458\uFF1B5\uFF1A\u533B\u751F\u8D28\u63A7\u5458\uFF1B6\uFF1A\u79D1\u4E3B\u4EFB\uFF1B7\uFF1A\u62A4\u58EB\u957F\uFF1B8\uFF1A\u62A4\u58EB\u8D28\u63A7\u5458
 
+#\u79D1\u4E3B\u4EFB\u548C\u62A4\u58EB\u957F\u5BA1\u6838\u65F6\u9700\u8981\u8FC7\u6EE4\u6821\u9A8C\u7684\u4EFB\u52A1\u6587\u4EF6\u540D\u79F0\u96C6\u5408
+notJudgeTasks = \u77E5\u60C5\u540C\u610F\u4E66
+
+#\u7B2C\u4E09\u65B9oracle\u914D\u7F6E\u4FE1\u606F
+oracleUrl = 200.100.100.1:1521/orc1
+oracleUserName = Jswzh
+oraclePassWord = Jswzh
+
+#oracleUrl = 127.0.0.1:1521/ORCL
+#oracleUserName = docus
+#oraclePassWord = docus702
+

src/main/resources/mapper/ArchiveOtherExtMapper.xml

@@ -824,17 +824,6 @@
       jzh = #{jzh}
       <if test="sysFlag != null">
         AND sysFlag = #{sysFlag}
-        <if test="sysFlag == 2">
-          AND C1 != '一般病程记录' UNION ALL
-          SELECT
-          jzh,
-          C1,
-          C2,
-          convert( VARCHAR ( 19 ), sysUpdateTime, 120 ) sysUpdateTime
-          FROM
-          archive_other_ext
-          INNER JOIN ( SELECT top 1 ID FROM archive_other_ext WHERE jzh = #{jzh} AND sysFlag = 2 AND C1 = '一般病程记录' ORDER BY sysUpdateTime DESC ) archive_other_ext1 ON archive_other_ext.ID = archive_other_ext1.ID
-        </if>
       </if>
     </where>
   </select>

src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp

@@ -857,7 +857,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/beHospList/beHospList.js?time=2021-12-10"></script>
+<script src="${path}/static/js/beHospList/beHospList.js?time=2021-12-15"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2021-11-25"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
 </html>

src/main/webapp/static/js/beHospList/beHospList.js

@@ -534,7 +534,10 @@ $("#verifyBtn").on('click', function () {
             }
         } else {
             //实时查询科主任或护士长审核时采集任务是否采集完成
-            judgeCollectCompleted('',$("#roleCode").val(),$("#jzh").val());
+            var flag = judgeCollectCompleted('',$("#roleCode").val(),$("#jzh").val());
+            if(!flag){
+                return ;
+            }
             save(1,'');
         }
     }
@@ -543,7 +546,10 @@ $("#verifyBtn").on('click', function () {
 $("#wzSaveBtn").on('click', function () {
     $("#WZModal").modal('hide');
     //实时查询科主任或护士长审核时采集任务是否采集完成
-    judgeCollectCompleted('',$("#roleCode").val(),$("#jzh").val());
+    var flag = judgeCollectCompleted('',$("#roleCode").val(),$("#jzh").val());
+    if(!flag){
+        return ;
+    }
     save(1,'');
 });
 //批量初审功能 批量审批①
@@ -628,6 +634,7 @@ $("#sureBtn").click(function(){
     var successCount = 0;
     var failCount = 0;
     var failSelects = [];
+    var flag = true;
     for (var i = 0; i < selects.length; i++) {
         var isSuccess = selects[i].isSuccess;
         if(isSuccess == '0'){
@@ -636,11 +643,14 @@ $("#sureBtn").click(function(){
         }else{
             //实时查询科主任或护士长审核时采集任务是否采集完成
             if(selects[i].operRole != null) {
-                judgeCollectCompleted(selects[i].name,selects[i].operRole,selects[i].patientId);
+                flag = judgeCollectCompleted(selects[i].name,selects[i].operRole,selects[i].patientId);
             }
             successCount++;
         }
     }
+    if(!flag){
+        return ;
+    }
     $('#verifyModal').modal('hide');
     save(successCount,failSelects);
 })
@@ -706,13 +716,12 @@ function judgeCollectCompleted(name,roleCode,jzh){
                         msg = name + msg;
                     }
                     toastr.warning(msg);
+                    return flag;
                 }
             }
         });
     }
-    if(!flag){
-        return;
-    }
+    return flag;
 }
 
 //查看退回信息