shiyue 4 years ago
parent
commit
48353ee4fe

+ 16 - 1
src/main/java/com/diagbot/facade/DataPageDockFacade.java

@@ -80,6 +80,7 @@ public class DataPageDockFacade {
 
     public RespDTO<String> getDataService(DataPageDockNbrmVo dataPageDockNbrmVo) {
         String url="";
+        long time1 = System.currentTimeMillis();
         dataPageDockNbrmVo.setHospitalId(Long.valueOf("4"));
         PushJoinVO pushJoinVO = new PushJoinVO();
         BeanUtil.copyProperties(dataPageDockNbrmVo, pushJoinVO);
@@ -95,9 +96,12 @@ public class DataPageDockFacade {
         pushJoinVO.setMenstrual(dataPageDockNbrmVo.getMedicalHistory().getMenstrual());
         pushJoinVO.setOther(dataPageDockNbrmVo.getMedicalHistory().getOther());
         pushJoinVO.setAge(dataPageDockNbrmVo.getAge().toString());
+        long time2 = System.currentTimeMillis();
+        System.out.println("参数改变用时---------------"+(time2-time1));
         // 将基本参数保存到redis
         String mrId = mrFacade.createMr(pushJoinVO);
-
+        long time3 = System.currentTimeMillis();
+        System.out.println("-----------------保存到redis用时"+(time3-time2));
         switch (dataPageDockNbrmVo.getCode()){
             //开单合理性
             case "5":
@@ -105,7 +109,18 @@ public class DataPageDockFacade {
                 BeanUtil.copyProperties(pushJoinVO, indicationPushVO);
                 indicationPushVO.setRuleType("2");
                 IndicationDTO indicationDTO=pushFacade.indicationPush(indicationPushVO);
+                long time4 = System.currentTimeMillis();
+                System.out.println("-----------------结束code用时"+(time4-time3));
                 if (indicationDTO.getBillMsgList().size()==0){
+                    TranDatadockingLog tranDatadockingLog=new TranDatadockingLog();
+                    tranDatadockingLog.setHospitalId(dataPageDockNbrmVo.getHospitalId());
+                    tranDatadockingLog.setParamIn(JSON.toJSONString(dataPageDockNbrmVo));
+                    tranDatadockingLog.setParamOut(url);
+                    tranDatadockingLog.setRemark("页面推送模式,"+dataPageDockNbrmVo.getCode());
+
+                    tranDatadockingLog.setTransTime(new Date());
+
+                    dataDockingLogFacade.save(tranDatadockingLog);
                     return RespDTO.onError("无推送内容");
                 }
                 url="http://10.48.45.180:5654/cdss.html?mrId="+mrId+"&hospitalId="+dataPageDockNbrmVo.getHospitalId()+"&planCode=order_rational";

+ 2 - 2
src/main/java/com/diagbot/vo/DataPageDockNbrmVo.java

@@ -93,7 +93,7 @@ public class DataPageDockNbrmVo {
 	/**
 	 * 药品
 	 */
-	private List<Item> drug;
+	private List<Drug> drug;
 	/**
 	 * 当前化验开单项
 	 */
@@ -109,7 +109,7 @@ public class DataPageDockNbrmVo {
 	/**
 	 * 当前药品开单项
 	 */
-	private List<Item> drugOrder;
+	private List<Drug> drugOrder;
 	/**
 	 * 当前手术开单项
 	 */

+ 3 - 3
src/main/resources/application-test.yml

@@ -59,9 +59,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.241:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-      username: root
-      password: lantone
+      url: jdbc:mysql://192.168.2.121:3306/cdss?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      username: teamtec
+      password: rpPh9Gn6BQ
       # 连接池的配置信息
       # 初始化大小,最小,最大
       initialSize: 5