视图解析

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

@@ -50,12 +50,12 @@ public class DataPageDockFacade {
      * @Author:liuqq
      * @time: ${DATE} ${TIME}
      **/
-    public RespDTO<String> getStaticKnowledge(StaticKnowledgeHISVO staticKnowledgeHISVO){
-        String url=dataPageUrl+"/informationOut.html?hospitalId="+staticKnowledgeHISVO.getHospitalId()
-                +"&type="+staticKnowledgeHISVO.getType()
-                +"&hisName="+staticKnowledgeHISVO.getHisName();
-        if(StringUtil.isNotEmpty(staticKnowledgeHISVO.getHisDetailName())){
-            url+="&hisDetailName="+staticKnowledgeHISVO.getHisDetailName();
+    public RespDTO<String> getStaticKnowledge(StaticKnowledgeHISVO staticKnowledgeHISVO) {
+        String url = dataPageUrl + "/informationOut.html?hospitalId=" + staticKnowledgeHISVO.getHospitalId()
+                + "&type=" + staticKnowledgeHISVO.getType()
+                + "&hisName=" + staticKnowledgeHISVO.getHisName();
+        if (StringUtil.isNotEmpty(staticKnowledgeHISVO.getHisDetailName())) {
+            url += "&hisDetailName=" + staticKnowledgeHISVO.getHisDetailName();
         }
         return RespDTO.onSuc(url);
     }
@@ -67,44 +67,43 @@ public class DataPageDockFacade {
      **/
     public RespDTO<String> getDataService(DataPageDockVO dataPageDockVO) {
         //参数校验
-        if(dataPageDockVO.getHospitalId()==null){
+        if (dataPageDockVO.getHospitalId() == null) {
             return RespDTO.onError("请输入医院id");
-        }else if("".equals(dataPageDockVO.getShowType())){
+        } else if ("".equals(dataPageDockVO.getShowType())) {
             return RespDTO.onError("请输入展示类型,横版：ver，或竖版hor");
-        }else if("".equals(dataPageDockVO.getPlanCode())){
+        } else if ("".equals(dataPageDockVO.getPlanCode())) {
             return RespDTO.onError("请输入方案编码");
         }
 
-        String url="";
-        String pushMrId="";
+        String url = "";
+        String pushMrId = "";
         PushJoinVO pushJoinVO = new PushJoinVO();
         BeanUtil.copyProperties(dataPageDockVO, pushJoinVO);
         // 将基本参数保存到redis
         String mrId = mrFacade.createMr(pushJoinVO);
         //开单合理性推理时，验证下是否有推送，无推送时，不给url,code为“-1”
-        if(dataPageDockVO.getPlanCode().equals("order_rational") || dataPageDockVO.getPlanCode().equals("reference_pacs") || dataPageDockVO.getPlanCode().equals("reference_lis")){
-            IndicationPushVO indicationPushVO=new IndicationPushVO();
+        if (dataPageDockVO.getPlanCode().equals("order_rational") || dataPageDockVO.getPlanCode().equals("reference_pacs") || dataPageDockVO.getPlanCode().equals("reference_lis")) {
+            IndicationPushVO indicationPushVO = new IndicationPushVO();
             //初始化开单合理性入参
-            BeanUtil.copyProperties(dataPageDockVO,indicationPushVO);
+            BeanUtil.copyProperties(dataPageDockVO, indicationPushVO);
             indicationPushVO.setRuleType("1,2,3,4");
             IndicationDTO indicationDTO = pushFacade.indicationPush(indicationPushVO);
             if (indicationDTO != null) {
                 if (ListUtil.isNotEmpty(indicationDTO.getBillMsgList()) || ListUtil.isNotEmpty(indicationDTO.getHighRiskList())
-                        || ListUtil.isNotEmpty(indicationDTO.getCriticalValList()) || ListUtil.isNotEmpty(indicationDTO.getOtherList()))
-                {
-                    pushMrId= mrFacade.createIndicationMr(indicationDTO);
-                }else{
+                        || ListUtil.isNotEmpty(indicationDTO.getCriticalValList()) || ListUtil.isNotEmpty(indicationDTO.getOtherList())) {
+                    pushMrId = mrFacade.createIndicationMr(indicationDTO);
+                } else {
                     return RespDTO.onError("无开单合理性提醒！");
                 }
-            }else{
+            } else {
                 return RespDTO.onError("无开单合理性提醒！");
             }
         }
 
-        if("hor".equals(dataPageDockVO.getShowType())){
-            url=dataPageUrl+"/cdssHorizontal.html?pushMrId="+pushMrId+"&mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
-        }else{
-            url=dataPageUrl+"/cdss.html?pushMrId="+pushMrId+"&mrId="+mrId+"&hospitalId="+dataPageDockVO.getHospitalId()+"&planCode="+dataPageDockVO.getPlanCode();
+        if ("hor".equals(dataPageDockVO.getShowType())) {
+            url = dataPageUrl + "/cdssHorizontal.html?pushMrId=" + pushMrId + "&mrId=" + mrId + "&hospitalId=" + dataPageDockVO.getHospitalId() + "&planCode=" + dataPageDockVO.getPlanCode();
+        } else {
+            url = dataPageUrl + "/cdss.html?pushMrId=" + pushMrId + "&mrId=" + mrId + "&hospitalId=" + dataPageDockVO.getHospitalId() + "&planCode=" + dataPageDockVO.getPlanCode();
         }
 
         return RespDTO.onSuc(url);
@@ -118,7 +117,7 @@ public class DataPageDockFacade {
     public PushDTO getEnginePush(DataEngineVO dataEngineVO) {
         PushVO pushVO = new PushVO();
         BeanUtil.copyProperties(dataEngineVO, pushVO);
-        PushDTO pushDTO=pushFacade.push(pushVO);
+        PushDTO pushDTO = pushFacade.push(pushVO);
         pushDTO.setDebug(null);
         pushDTO.setSymptom(null);
         pushDTO.setVital(null);
@@ -128,18 +127,18 @@ public class DataPageDockFacade {
         pushDTO.setTreat(null);
 
 
-        try{
-            TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
+        try {
+            TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
             tranDatadockingLog.setHospitalId(dataEngineVO.getHospitalId());
             tranDatadockingLog.setParamIn(JSON.toJSONString(dataEngineVO));
             tranDatadockingLog.setParamOut(JSON.toJSONString(pushDTO));
-            tranDatadockingLog.setRemark("数据引擎模式，"+dataEngineVO.getPlanCode());
+            tranDatadockingLog.setRemark("数据引擎模式，" + dataEngineVO.getPlanCode());
 
             tranDatadockingLog.setTransTime(new Date());
 
             dataDockingLogFacade.save(tranDatadockingLog);
-        }catch (Exception e){
-            log.error("数据引擎模式，增加日志异常",e.getMessage());
+        } catch (Exception e) {
+            log.error("数据引擎模式，增加日志异常", e.getMessage());
         }
 
         return pushDTO;
@@ -151,119 +150,124 @@ public class DataPageDockFacade {
      * @time: ${DATE} ${TIME}
      **/
     public RespDTO getEngineIndicationPush(DataEngineVO dataEngineVO) {
-        IndicationPushVO indicationPushVO=new IndicationPushVO();
+        IndicationPushVO indicationPushVO = new IndicationPushVO();
         BeanUtil.copyProperties(dataEngineVO, indicationPushVO);
         indicationPushVO.setRuleType("1,2,3,4");
-        IndicationDTO indicationDTO=pushFacade.indicationPush(indicationPushVO);
+        IndicationDTO indicationDTO = pushFacade.indicationPush(indicationPushVO);
         indicationDTO.setDebug(null);
 
         if (indicationDTO != null) {
             if (ListUtil.isNotEmpty(indicationDTO.getBillMsgList()) || ListUtil.isNotEmpty(indicationDTO.getHighRiskList())
-                    || ListUtil.isNotEmpty(indicationDTO.getCriticalValList()) || ListUtil.isNotEmpty(indicationDTO.getOtherList()))
-            {
+                    || ListUtil.isNotEmpty(indicationDTO.getCriticalValList()) || ListUtil.isNotEmpty(indicationDTO.getOtherList())) {
                 return RespDTO.onSuc(indicationDTO);
-            }else{
+            } else {
                 return RespDTO.onError("无开单合理性提醒！");
             }
-        }else{
+        } else {
             return RespDTO.onError("无开单合理性提醒！");
         }
     }
 
 
-    public PushPlanDTO getOperationPlanPush(DataEngineVO dataEngineVO){
-        PushPlanVO pushPlanVO=new PushPlanVO();
+    public PushPlanDTO getOperationPlanPush(DataEngineVO dataEngineVO) {
+        PushPlanVO pushPlanVO = new PushPlanVO();
         BeanUtil.copyProperties(dataEngineVO, pushPlanVO);
 
-        PushPlanDTO pushPlanDTO=pushFacade.pushPlan(pushPlanVO);
+        PushPlanDTO pushPlanDTO = pushFacade.pushPlan(pushPlanVO);
         pushPlanDTO.setDebug(null);
-        try{
-            TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
+        try {
+            TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
             tranDatadockingLog.setHospitalId(dataEngineVO.getHospitalId());
             tranDatadockingLog.setParamIn(JSON.toJSONString(dataEngineVO));
             tranDatadockingLog.setParamOut(JSON.toJSONString(pushPlanDTO));
-            tranDatadockingLog.setRemark("数据引擎模式，"+dataEngineVO.getPlanCode());
+            tranDatadockingLog.setRemark("数据引擎模式，" + dataEngineVO.getPlanCode());
 
             tranDatadockingLog.setTransTime(new Date());
 
             dataDockingLogFacade.save(tranDatadockingLog);
-        }catch (Exception e){
-            log.error("数据引擎模式，增加日志异常",e.getMessage());
+        } catch (Exception e) {
+            log.error("数据引擎模式，增加日志异常", e.getMessage());
         }
         return pushPlanDTO;
     }
 
 
     //厦门根据视图来取所需数据
-    public RespDTO<String> getDataServiceXY(StructuralDataVo structuralDataVo){
+    public RespDTO<String> getDataServiceXY(StructuralDataVo structuralDataVo) {
         DataPageDockVO dataPageDockVO = new DataPageDockVO();
         try {
-            String where = " where behospitalCode =  '" + structuralDataVo.getBehospitalCode() + "'";
-            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 '%药%' 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 where = " where behospitalCode =  '" + structuralDataVo.getBehospitalCode() + "' and fileCode = '" + structuralDataVo.getFileCode() + "'";
+            String DrugSql = " select * from drug       " + where;
+            String DiagSql = " select * from diag       " + where;
+            String InfoSql = " select * from medical_record   " + where;
+            String lisSql = "  select * from assay_list       " + where;
+            String PacsSql = " select * from check_list       " + where;
+            String OpsSql = "  select * from homepage_operation         " + where;
+//            String OpsOrderSql = " select * from cdss_ops    " + where + " and status =' REQUEST'";
+//            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 DiseaseNameSql = "select * from cdss_diag " + where + " and isno = '01'";
 
             //得到基本信息并赋予
             Map<String, String> map = tzDBConn.getInfo(InfoSql);
             dataPageDockVO.setPlanCode(structuralDataVo.getPlanCode());
             dataPageDockVO.setHospitalId(structuralDataVo.getHospitalId());//医院id
-            dataPageDockVO.setShowType("ver");//展示方式
+            dataPageDockVO.setShowType("ver");//展示方式(待解决)
             dataPageDockVO.setAge(map.get("age"));//年龄
-            dataPageDockVO.setSex(Integer.parseInt(StringUtils.isNoneBlank(map.get("sex"))?map.get("sex"):"0"));//性别
+            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"));//现病史
+            dataPageDockVO.setVital(map.get("vital"));//查体
             dataPageDockVO.setPasts(map.get("pasts"));//既往史
-            dataPageDockVO.setVital(map.get("vital") + map.get("vital1"));//查体
-            dataPageDockVO.setMarital(map.get("marital"));//婚育史
+            dataPageDockVO.setInfectious(map.get("infectious"));//传染病史
+            dataPageDockVO.setSurgical(map.get("surgical"));//手术外伤史
             dataPageDockVO.setAllergy(map.get("allergy"));//过敏史
+            dataPageDockVO.setVaccination(map.get("vaccination"));//接种史
+            dataPageDockVO.setPersonal(map.get("personal"));//个人史
+            dataPageDockVO.setMarital(map.get("marital"));//婚育史
             dataPageDockVO.setFamily(map.get("family"));//家族史
             dataPageDockVO.setOther(map.get("menstrual"));//月经史
 
             System.out.println(JSON.toJSONString(dataPageDockVO) + "-------------------------------------信息");
 
             //获取Order信息并赋予
-            dataPageDockVO.setPacsOrder(tzDBConn.getPacsOrder(PacsOrderSql));
-            dataPageDockVO.setLisOrder(tzDBConn.getLisOrder(LisOrderSql));
-            dataPageDockVO.setOperationOrder(tzDBConn.getItem(OpsOrderSql));
-            dataPageDockVO.setDrugOrder(tzDBConn.getDrugOrder(DrugSql));
-            dataPageDockVO.setDiseaseName(tzDBConn.getItem(DiseaseNameSql).size() > 0 ? tzDBConn.getItem(DiseaseNameSql).get(0) : new Item());
+//            dataPageDockVO.setPacsOrder(tzDBConn.getPacsOrder(PacsOrderSql));
+//            dataPageDockVO.setLisOrder(tzDBConn.getLisOrder(LisOrderSql));
+//            dataPageDockVO.setOperationOrder(tzDBConn.getItem(OpsOrderSql));
+//            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");
+//            System.out.println(JSON.toJSONString(dataPageDockVO) + "-------------------------------------Order");
 
             //获取历史信息并赋予
             dataPageDockVO.setPacs(tzDBConn.getPacs(PacsSql));
             dataPageDockVO.setLis(tzDBConn.getLis(lisSql));
-            dataPageDockVO.setDrug(tzDBConn.getDrugOrder(DrugSql));
-            dataPageDockVO.setDiag(tzDBConn.getItem(DiagSql));
-            dataPageDockVO.setOperation(tzDBConn.getItem(OpsSql));
+            dataPageDockVO.setDrug(tzDBConn.getDrug(DrugSql));
+            dataPageDockVO.setDiag(tzDBConn.getDiag(DiagSql));
+            dataPageDockVO.setOperation(tzDBConn.getOperation(OpsSql));
 
             System.out.println(JSON.toJSONString(dataPageDockVO) + "---------------------------------------历史数据");
             //保存入参到库里 方便以后查看
-            TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
+            TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
             tranDatadockingLog.setDoctorCode("正常入参");
             tranDatadockingLog.setHospitalId(dataPageDockVO.getHospitalId());
             tranDatadockingLog.setParamIn(JSON.toJSONString(structuralDataVo));
             tranDatadockingLog.setParamOut(JSON.toJSONString(dataPageDockVO));
-            tranDatadockingLog.setRemark("方案编码，"+dataPageDockVO.getPlanCode());
-            tranDatadockingLog.setInquiryCode("病人住院号:  "+structuralDataVo.getBehospitalCode());
+            tranDatadockingLog.setRemark("方案编码，" + dataPageDockVO.getPlanCode());
+            tranDatadockingLog.setInquiryCode("病人住院号:  " + structuralDataVo.getBehospitalCode());
             tranDatadockingLog.setTransTime(new Date());
             dataDockingLogFacade.save(tranDatadockingLog);
 
-        }catch (Exception e){
-            TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
-            tranDatadockingLog.setRemark("获取数据失败，"+structuralDataVo);
+        } catch (Exception e) {
+            TranDatadockingLog tranDatadockingLog = new TranDatadockingLog();
+            tranDatadockingLog.setRemark("获取数据失败，" + structuralDataVo);
             tranDatadockingLog.setTransTime(new Date());
             dataDockingLogFacade.save(tranDatadockingLog);
-        }finally {
+        } finally {
             tzDBConn.close();
         }
         return this.getDataService(dataPageDockVO);

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

@@ -6,6 +6,7 @@ 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 org.springframework.expression.Operation;
 
 import java.sql.*;
 import java.util.HashMap;
@@ -20,12 +21,12 @@ public class TZDBConn {
     private static final String USERNAME = getValue("jdbc.username");
     private static final String PASSWORD = getValue("jdbc.password");
 
-	public static final Long HOSPITAL_ID=Long.valueOf("14");//1:长兴，2：邵逸夫，3：台州市立医院
-    
+	public static final Long HOSPITAL_ID=Long.valueOf("35");//1:长兴，2：邵逸夫，3：台州市立医院
+
     private static Connection connection = null;
     private static PreparedStatement sta = null;
 	private static ResultSet rs = null;
-	
+
 	/**
      * 读取属性文件中的信息
      *
@@ -37,7 +38,7 @@ public class TZDBConn {
         ResourceBundle bundle = ResourceBundle.getBundle("jdbc");
         return bundle.getString(key);
     }
-    
+
     /**
 	 * 加载驱动程序
 	 */
@@ -48,7 +49,7 @@ public class TZDBConn {
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * @return 连接对象
 	 */
@@ -60,7 +61,7 @@ public class TZDBConn {
 		}
 		return connection;
 	}
-	
+
 	/**
 	 * @param sql sql语句
 	 * @param obj 参数
@@ -81,7 +82,7 @@ public class TZDBConn {
 		}
 		return rs;
 	}
-	
+
 	/**
 	 * 关闭资源
 	 */
@@ -110,141 +111,77 @@ public class TZDBConn {
 			}
 		}
 	}
-	
-	/**
-	 * Drug信息
-	 * @return
-	 */
-	public List<Drug> getDrug(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;
-	}
-
-	/**
-	 * 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;
-	}
+    /**
+     * Drug信息
+     *
+     * @return
+     */
+    public List<Drug> getDrug(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"));//结果时间
+                drug.setForm(rs.getString("form"));//药品剂型
+                drugs.add(drug);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-	/**
-	 * item信息
-	 * @return
-	 */
-	public List<Item> getOrder(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"));
-				item.setFrequency(rs.getString("frequency"));//频次
-				items.add(item);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+        return drugs;
+    }
 
-		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();
-		}
+    /**
+     * Diag信息
+     *
+     * @return
+     */
+    public List<Item> getDiag(String sql) {
+        List<Item> diags = 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"));//结果时间
+                diags.add(drug);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-		return items;
-	}
+        return diags;
+    }
 
 	/**
 	 * Lis信息
+	 *
 	 * @return
 	 */
 	public List<Lis> getLis(String sql) {
-		List<Lis> list =Lists.newLinkedList();
-		TZDBConn dbconn=new TZDBConn();
+		List<Lis> list = Lists.newLinkedList();
+		TZDBConn dbconn = new TZDBConn();
 		try {
-			rs =dbconn.Query(sql, null);
+			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.setDetailName(rs.getString("detailName"));
-				lis.setDateValue(rs.getString("dateValue"));//结果时间
-				lis.setOtherValue(rs.getString("otherValue"));//检验结果值(文本)
-				lis.setUnits(rs.getString("units"));//单位
-				if (StringUtils.isNoneBlank(rs.getString("minValue"))){
-					lis.setMinValue(pattern.matcher(rs.getString("minValue")).matches()?Double.parseDouble(rs.getString("minValue")):null);//最小值
+			while (rs.next()) {
+				Lis lis = new Lis();
+				lis.setDetailName(rs.getString("detailName"));//检验细项名称
+				lis.setOtherValue(rs.getString("result"));//检验结果值(文本)
+				lis.setUnits(rs.getString("unit"));//单位
+				if (StringUtils.isNoneBlank(rs.getString("referenceMin"))) {
+					lis.setMinValue(pattern.matcher(rs.getString("referenceMin")).matches() ? Double.parseDouble(rs.getString("referenceMin")) : null);//最小值
 				}
-				if (StringUtils.isNoneBlank(rs.getString("maxValue"))){
-					lis.setMaxValue(pattern.matcher(rs.getString("maxValue")).matches()?Double.parseDouble(rs.getString("maxValue")):null);//最大值
+				if (StringUtils.isNoneBlank(rs.getString("referenceMax"))) {
+					lis.setMaxValue(pattern.matcher(rs.getString("referenceMax")).matches() ? Double.parseDouble(rs.getString("referenceMax")) : 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) {
@@ -255,40 +192,20 @@ public class TZDBConn {
 
 	/**
 	 * Pacs信息
+	 *
 	 * @return
 	 */
 	public List<Pacs> getPacs(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.setDesc(rs.getString("pacsDesc"));//检查描述
-				pacs1.setResult(rs.getString("result"));//检查结果
-				pacs.add(pacs1);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return pacs;
-	}
-	/**
-	 * Pacs信息
-	 * @return
-	 */
-	public List<Pacs> getPacsOrder(String sql) {
-		List<Pacs> pacs =Lists.newLinkedList();
-		TZDBConn dbconn=new TZDBConn();
+		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"));//名称
+			rs = dbconn.Query(sql, null);
+			while (rs.next()) {
+				Pacs pacs1 = new Pacs();
+				pacs1.setName(rs.getString("repName"));//医院检查名称
+				pacs1.setDesc(rs.getString("clinicSight"));//检查描述
+				pacs1.setResult(rs.getString("reptDiag"));//检查结果
 				pacs1.setDateValue(rs.getString("dateValue"));//结果时间
-				pacs1.setFrequency(rs.getString("frequency"));//频次
 				pacs.add(pacs1);
 			}
 		} catch (Exception e) {
@@ -298,7 +215,144 @@ public class TZDBConn {
 	}
 
 
+    /**
+     * Operation信息
+     *
+     * @return
+     */
+    public List<Item> getOperation(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("operationName"));//手术名称
+                item.setDateValue(rs.getString("operationDate"));//开单时间
+                items.add(item);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
+        return items;
+    }
+
+//	/**
+//	 * 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"));//结果时间
+//				drug.setForm(rs.getString("form"));//药品剂型
+//				drugs.add(drug);
+//			}
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//
+//		return drugs;
+//	}
+//
+//	/**
+//	 * item信息
+//	 * @return
+//	 */
+//	public List<Item> getOrder(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"));
+//				item.setFrequency(rs.getString("frequency"));//频次
+//				items.add(item);
+//			}
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//
+//		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;
+//	}
+//
+//
+//	/**
+//	 * 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();
+//		}
+//		return list;
+//	}
+//
+//	/**
+//	 * 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
@@ -319,5 +373,5 @@ public class TZDBConn {
 		return map;
 	}
 
-	
+
 }

src/main/resources/jdbc.properties

@@ -4,6 +4,6 @@
 #jdbc.password=qymz
 
 jdbc.driverClassName=oracle.jdbc.OracleDriver
-jdbc.url=jdbc:oracle:thin:@192.168.12.88:1521/KEMR
+jdbc.url=jdbc:oracle:thin:@132.147.254.159:1521/dbserver
 jdbc.username=langtong
-jdbc.password=xmdwyylt
+jdbc.password=langtong