2020-10-08更新版本

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

@@ -39,6 +39,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 
 @Controller
@@ -249,20 +250,63 @@ public class beHospitaledController {
                 list = OracleConnect.select1(sql);
             }catch (Exception e){
                 ExceptionPrintUtil.printException(e);
-                log.error("优先采集查询oracle出错,请查看error.log文件");
+                log.info("优先采集查询oracle出错,请查看error.log文件");
             }
             log.info("list数量:"+list.size()+"个->list:"+list);
             //赋值两时间：最近上传时间与最新手动提交时间
             if(!CollectionUtils.isEmpty(list)) {
-                setTwoTimeForList(list);
-                log.info("优先采集查询成功!");
+                //判断是否带标题或编号
+                list = selectListTemp(collectInfo,list);
+                if(!CollectionUtils.isEmpty(list)) {
+                    setTwoTimeForList(list);
+                }
             }
+            log.info("优先采集查询成功!");
             return JSON.toJSONString(list);
         } catch (Exception e) {
             ExceptionPrintUtil.printException(e);
         }
         return null;
     }
+    //判断是否带标题或编号
+    private List<HisCollectInfo> selectListTemp(HisCollectInfo collectInfo, List<HisCollectInfo> list) {
+        //定义临时变量
+        int flag = 0;
+        //标题
+        String frecName = collectInfo.getFrecName();
+        if(StringUtils.isNotBlank(frecName)){
+            flag = 1;
+        }
+        //分类编码
+        String fentryNo = collectInfo.getFentryNo();
+        if(StringUtils.isNotBlank(fentryNo)){
+            flag = 2;
+        }
+        if(StringUtils.isNotBlank(frecName) && StringUtils.isNotBlank(fentryNo)){
+            flag = 3;
+        }
+        if(flag != 0){
+            List<HisCollectInfo> tempList = new LinkedList<>();
+            for(HisCollectInfo info : list){
+                if(flag == 1){
+                    if(info.getFrecName().contains(frecName)){
+                        tempList.add(info);
+                    }
+                }else if(flag == 2){
+                    if(info.getFentryNo().contains(fentryNo)){
+                        tempList.add(info);
+                    }
+                }else {
+                    if(info.getFrecName().contains(frecName) && info.getFentryNo().contains(fentryNo)){
+                        tempList.add(info);
+                    }
+                }
+            }
+            return tempList;
+        }else{
+            return list;
+        }
+    }
 
     //赋值两时间：最近上传时间与最新手动提交时间
     private void setTwoTimeForList(List<HisCollectInfo> list) {
@@ -314,20 +358,10 @@ public class beHospitaledController {
     //组织sql语句查询orcle查询文件完成情况
     private String getSelectSqlForGetPdfCollect(HisCollectInfo collectInfo){
         String sql = "select FPATNO,FENTRY_NO,FENTRY_NAME,FREC_NAME,FFILE_ID,PDF_FLAG from pacs.v_emrpdf_rec where fpatno = '"+collectInfo.getFpatno()+"'";
-        //标题
-        String frecName = collectInfo.getFrecName();
-        if(StringUtils.isNotBlank(frecName)){
-            sql += " and FREC_NAME like '%"+frecName+"%'";
-        }
-        //分类编码
-        String fentryNo = collectInfo.getFentryNo();
-        if(StringUtils.isNotBlank(fentryNo)){
-            sql += " and FENTRY_NO = '"+fentryNo+"'";
-        }
         //状态
         String pdfflag = collectInfo.getPdfflag();
         if(StringUtils.isNotBlank(pdfflag)){
-            sql += " and PDF_FLAG = '"+pdfflag+"'";
+            sql += " and pdf_flag = '"+pdfflag+"'";
         }
         return sql;
     }

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

@@ -21,11 +21,8 @@ public class taskController {
 //        String realPath = request.getSession().getServletContext().getRealPath("/");
 //        realPath = realPath.split("target")[0] + pictureUrl + "\\static\\img\\";
         String projectPath = System.getProperty("user.dir") + "\\static\\img\\pdfFiles\\typesPdf\\";
-        System.out.println("projectPath==" + projectPath);
         PDFUtils.delAllFile(projectPath);
     }
-
-
 }
  
 

src/main/resources/config/jdbc.properties

@@ -1,13 +1,13 @@
 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=emr_record
 jdbc.username=sa
-jdbc.password=xjgs+docus911
+jdbc.password=docus702
 
 #Oracle
 oracle.driver=oracle.jdbc.driver.OracleDriver
 oracle.url=jdbc:oracle:thin:@192.168.10.6:1521/orc1
 oracle.username=pacs
-oracle.password=pacsfa
+oracle.password=pacs
 #hibernate config
 hibernate.dialect=org.hibernate.dialect.SQLServerDialect
 hibernate.show_sql=true
@@ -25,9 +25,9 @@ pictureUrl=src\\main\\webapp
 #powerUrl=http://120.27.212.36:8888/power/font/getMenusByUserIdAndSysFlag
 #POWER_URLHEAD=http://120.27.212.36:8888/power
 #power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934\u5982\uFF1Ahttp://192.168.1.3:8081/power
-powerUrl=http://10.36.116.108:8080/power/font/getMenusByUserIdAndSysFlag
-POWER_URLHEAD=http://10.36.116.108:8080/power
-POWER_JSP=http://10.36.116.108:8080/power
+powerUrl=http://localhost:8080/power/font/getMenusByUserIdAndSysFlag
+POWER_URLHEAD=http://localhost:8080/power
+POWER_JSP=http://localhost:8080/power
 recallReason=医院需要这份文档
 HomepageDictionary=http://10.36.116.108:8080/filing/services/HomepageDictionary?wsdl
 HomepageMethod=CheckData

src/main/resources/rebel.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
+  Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
+-->
+<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_1.xsd">
+
+	<classpath>
+		<dir name="D:/ideaProject/yingde/emr_medical_record_yd/target/classes">
+		</dir>
+	</classpath>
+
+	<web>
+		<link target="/">
+			<dir name="D:/ideaProject/yingde/emr_medical_record_yd/src/main/webapp">
+			</dir>
+		</link>
+	</web>
+
+</application>