厦门初始代码更改

src/main/java/com/diagbot/facade/DataPageDockFacade.java

@@ -14,6 +14,7 @@ import com.diagbot.util.TZDBConn;
 import com.diagbot.vo.*;
 import com.diagbot.xm.vo.StructuralDataVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -197,17 +198,18 @@ public class DataPageDockFacade {
     public RespDTO<String> getDataServiceXM(StructuralDataVo structuralDataVo){
         DataPageDockVO dataPageDockVO = new DataPageDockVO();
         try {
-            String where = "  where behospitalCode =  '" + structuralDataVo.getBehospitalCode() + "' and  patientId = " + structuralDataVo.getPatientId() + " ' ";
+            String where = " where behospitalCode =  '" + structuralDataVo.getBehospitalCode() + "' and  patientId = '" + structuralDataVo.getPatientId() + "'";
             String lisSql = " select * from cdss_lis         " + where;
             String PacsSql = " select * from cdss_pacs       " + where;
             String OpsOrderSql = " select * from cdss_ops    " + where + " and status =' REQUEST'";
             String OpsSql = " select * from cdss_ops         " + where + " and status !=' REQUEST'";
-            String DrugSql = " select * from cdss_order      " + where + " and orderCatalog like '%药%'";
+            String DrugSql = " select * from cdss_order      " + where + " and  ( orderCatalog like '%药%' or orderCatalog = '静脉输液')";
+            System.out.println(DrugSql);
             String LisOrderSql = " select * from cdss_order  " + where + " and orderCatalog = '检验'";
             String PacsOrderSql = " select * from cdss_order " + where + " and orderCatalog = '检查'";
             String DiagSql = " select * from cdss_diag       " + where;
             String InfoSql = "select * from cdss_info        " + where;
-            String DiseaseNameSql = "select * from cdss_diag" + where + " and isno = '01'";
+            String DiseaseNameSql = "select * from cdss_diag " + where + " and isno = '01'";
 
             //得到基本信息并赋予
             Map<String, String> map = tzDBConn.getInfo(InfoSql);
@@ -215,7 +217,7 @@ public class DataPageDockFacade {
             dataPageDockVO.setHospitalId(structuralDataVo.getHospitalId());//医院id
             dataPageDockVO.setShowType("ver");//展示方式
             dataPageDockVO.setAge(map.get("age"));//年龄
-            dataPageDockVO.setSex(Integer.parseInt(map.get("sex")));//性别
+            dataPageDockVO.setSex(Integer.parseInt(StringUtils.isNoneBlank(map.get("sex"))?map.get("sex"):"0"));//性别
             dataPageDockVO.setMarriage(map.get("marriage"));//婚姻
             dataPageDockVO.setChief(map.get("chief"));//主诉
             dataPageDockVO.setSymptom(map.get("symptom"));//现病史
@@ -229,10 +231,10 @@ public class DataPageDockFacade {
             System.out.println(JSON.toJSONString(dataPageDockVO) + "-------------------------------------信息");
 
             //获取Order信息并赋予
-            dataPageDockVO.setPacsOrder(tzDBConn.getPacs(PacsOrderSql));
-            dataPageDockVO.setLisOrder(tzDBConn.getLis(LisOrderSql));
+            dataPageDockVO.setPacsOrder(tzDBConn.getPacsOrder(PacsOrderSql));
+            dataPageDockVO.setLisOrder(tzDBConn.getLisOrder(LisOrderSql));
             dataPageDockVO.setOperationOrder(tzDBConn.getItem(OpsOrderSql));
-            dataPageDockVO.setDrugOrder(tzDBConn.getDrug(DrugSql));
+            dataPageDockVO.setDrugOrder(tzDBConn.getDrugOrder(DrugSql));
             dataPageDockVO.setDiseaseName(tzDBConn.getItem(DiseaseNameSql).size() > 0 ? tzDBConn.getItem(DiseaseNameSql).get(0) : new Item());
 
             System.out.println(JSON.toJSONString(dataPageDockVO) + "-------------------------------------Order");
@@ -240,7 +242,7 @@ public class DataPageDockFacade {
             //获取历史信息并赋予
             dataPageDockVO.setPacs(tzDBConn.getPacs(PacsSql));
             dataPageDockVO.setLis(tzDBConn.getLis(lisSql));
-            dataPageDockVO.setDrug(tzDBConn.getDrug(DrugSql));
+            dataPageDockVO.setDrug(tzDBConn.getDrugOrder(DrugSql));
             dataPageDockVO.setDiag(tzDBConn.getItem(DiagSql));
             dataPageDockVO.setOperation(tzDBConn.getItem(OpsSql));
 
@@ -249,7 +251,8 @@ public class DataPageDockFacade {
             TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
             tranDatadockingLog.setDoctorCode("正常入参");
             tranDatadockingLog.setHospitalId(dataPageDockVO.getHospitalId());
-            tranDatadockingLog.setParamIn(JSON.toJSONString(dataPageDockVO));
+            tranDatadockingLog.setParamIn(JSON.toJSONString(structuralDataVo));
+            tranDatadockingLog.setParamOut(JSON.toJSONString(dataPageDockVO));
             tranDatadockingLog.setRemark("方案编码，"+dataPageDockVO.getPlanCode());
             tranDatadockingLog.setInquiryCode("病人住院号:  "+structuralDataVo.getBehospitalCode());
             tranDatadockingLog.setTransTime(new Date());
@@ -260,6 +263,8 @@ public class DataPageDockFacade {
             tranDatadockingLog.setRemark("获取数据失败，"+structuralDataVo);
             tranDatadockingLog.setTransTime(new Date());
             dataDockingLogFacade.save(tranDatadockingLog);
+        }finally {
+            tzDBConn.close();
         }
         return this.getDataService(dataPageDockVO);
     }

src/main/java/com/diagbot/util/TZDBConn.java

@@ -5,6 +5,7 @@ import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.vo.Drug;
 import com.google.common.collect.Lists;
+import org.apache.commons.lang3.StringUtils;
 
 import java.sql.*;
 import java.util.HashMap;
@@ -123,22 +124,42 @@ public class TZDBConn {
 				Drug drug=new Drug();
 				drug.setName(rs.getString("name"));//名称
 				drug.setDateValue(rs.getString("dateValue"));
-				drug.setFrequency(rs.getString("frequency"));//频次
 				drugs.add(drug);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-		}finally {
-			close();
 		}
 
 		return drugs;
 	}
+
+	/**
+	 * DrugOrder信息
+	 * @return
+	 */
+	public List<Drug> getDrugOrder(String sql) {
+		List<Drug> drugs =Lists.newLinkedList();
+		TZDBConn dbconn=new TZDBConn();
+		try {
+			rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				Drug drug=new Drug();
+				drug.setName(rs.getString("name"));//名称
+				drug.setDateValue(rs.getString("dateValue"));
+				drugs.add(drug);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+		return drugs;
+	}
+
 	/**
 	 * item信息
 	 * @return
 	 */
-	public List<Item> getItem(String sql) {
+	public List<Item> getOrder(String sql) {
 		List<Item> items =Lists.newLinkedList();
 		TZDBConn dbconn=new TZDBConn();
 		try {
@@ -152,8 +173,27 @@ public class TZDBConn {
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-		}finally {
-			close();
+		}
+
+		return items;
+	}
+	/**
+	 * item信息没频次的
+	 * @return
+	 */
+	public List<Item> getItem(String sql) {
+		List<Item> items =Lists.newLinkedList();
+		TZDBConn dbconn=new TZDBConn();
+		try {
+			rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				Item item=new Item();
+				item.setName(rs.getString("name"));//名称
+				item.setDateValue(rs.getString("dateValue"));
+				items.add(item);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
 		}
 
 		return items;
@@ -172,18 +212,43 @@ public class TZDBConn {
 			while(rs.next()){
 				Lis lis =new Lis();
 				lis.setName(rs.getString("name"));//名称
+				lis.setDetailName(rs.getString("detailName"));
 				lis.setDateValue(rs.getString("dateValue"));//结果时间
-				lis.setFrequency(rs.getString("frequency"));//频次
 				lis.setOtherValue(rs.getString("otherValue"));//检验结果值(文本)
 				lis.setUnits(rs.getString("units"));//单位
-				lis.setMinValue(pattern.matcher(rs.getString("minValue")).matches()?Double.parseDouble(rs.getString("minValue")):null);//最小值
-				lis.setMaxValue(pattern.matcher(rs.getString("maxValue")).matches()?Double.parseDouble(rs.getString("maxValue")):null);//最大值
+				if (StringUtils.isNoneBlank(rs.getString("minValue"))){
+					lis.setMinValue(pattern.matcher(rs.getString("minValue")).matches()?Double.parseDouble(rs.getString("minValue")):null);//最小值
+				}
+				if (StringUtils.isNoneBlank(rs.getString("maxValue"))){
+					lis.setMaxValue(pattern.matcher(rs.getString("maxValue")).matches()?Double.parseDouble(rs.getString("maxValue")):null);//最大值
+				}
+				list.add(lis);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return list;
+	}
+
+	/**
+	 * LisOrder信息
+	 * @return
+	 */
+	public List<Lis> getLisOrder(String sql) {
+		List<Lis> list =Lists.newLinkedList();
+		TZDBConn dbconn=new TZDBConn();
+		try {
+			rs =dbconn.Query(sql, null);
+			Pattern pattern = Pattern.compile("^[0-9]+(\\.[0-9]*)?$");
+			while(rs.next()){
+				Lis lis =new Lis();
+				lis.setName(rs.getString("name"));//名称
+				lis.setDateValue(rs.getString("dateValue"));//结果时间
+				lis.setFrequency(rs.getString("frequency"));//频次
 				list.add(lis);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-		}finally {
-			close();
 		}
 		return list;
 	}
@@ -201,24 +266,45 @@ public class TZDBConn {
 				Pacs pacs1 =new Pacs();
 				pacs1.setName(rs.getString("name"));//名称
 				pacs1.setDateValue(rs.getString("dateValue"));//结果时间
-				pacs1.setFrequency(rs.getString("frequency"));//频次
-				pacs1.setDesc(rs.getString("desc"));//检查描述
+				pacs1.setDesc(rs.getString("pacsDesc"));//检查描述
 				pacs1.setResult(rs.getString("result"));//检查结果
 				pacs.add(pacs1);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
-		}finally {
-			close();
 		}
 		return pacs;
 	}
+	/**
+	 * Pacs信息
+	 * @return
+	 */
+	public List<Pacs> getPacsOrder(String sql) {
+		List<Pacs> pacs =Lists.newLinkedList();
+		TZDBConn dbconn=new TZDBConn();
+		try {
+			rs =dbconn.Query(sql, null);
+			while(rs.next()){
+				Pacs pacs1 =new Pacs();
+				pacs1.setName(rs.getString("name"));//名称
+				pacs1.setDateValue(rs.getString("dateValue"));//结果时间
+				pacs1.setFrequency(rs.getString("frequency"));//频次
+				pacs.add(pacs1);
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return pacs;
+	}
+
+
 
 	/**
 	 * 基本信息
 	 * @return
 	 */
-	public Map<String,String> getInfo(String sql) {
+
+	public  Map<String,String> getInfo(String sql) {
 		Map<String,String> map  = new HashMap<>();
 		TZDBConn dbconn=new TZDBConn();
 		try {
@@ -226,10 +312,9 @@ public class TZDBConn {
 			while(rs.next()){
 				map.put(rs.getString("info"),rs.getString("value"));//名称
 			}
+			System.out.println(map);
 		} catch (Exception e) {
 			e.printStackTrace();
-		}finally {
-			close();
 		}
 		return map;
 	}

src/main/resources/application-local.yml

@@ -59,9 +59,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://localhost:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.168.12.181:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
-      password: lantone
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -112,7 +112,7 @@ spring:
       cache: 15 # cache索引
       token: 15 # Token索引
       mr: 15 # 病历索引
-    host: 192.168.2.236  #Redis服务器地址
+    host: 192.168.12.182  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
@@ -172,16 +172,16 @@ tokenAuth:
 
 #图片服务器
 imageUrl:
-  prefix: http://192.168.2.236:82
+  prefix: http://192.168.12.180:82
 
 #病历质控地址
 mrqc:
-  url: http://192.168.2.236:5858
+  url: http://192.168.12.182:5858
 
 #CDSS核心地址
 cdss-core:
-  url: http://127.0.0.1:7010
+  url: http://192.168.12.182:7010
 
 #页面推送模式地址配置
 data-page:
-  url: http://192.168.2.122:5654
+  url: http://192.168.12.182:5654

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: cdss
   profiles:
-    active: test
+    active: local
   main:
     allow-bean-definition-overriding: true
 

src/main/resources/jdbc.properties

@@ -1,6 +1,9 @@
+#jdbc.driverClassName=oracle.jdbc.OracleDriver
+#jdbc.url=jdbc:oracle:thin:@192.168.2.102:1521/ORCL
+#jdbc.username=qymz
+#jdbc.password=qymz
 
 jdbc.driverClassName=oracle.jdbc.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.2.102:1521/ORCL
-jdbc.username=shiyue
-jdbc.password=shiyue
-
+jdbc.url=jdbc:oracle:thin:@192.168.12.88:1521/KEMR
+jdbc.username=langtong
+jdbc.password=xmdwyylt