病历，医嘱推送框

aipt-service/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ spring:
     name: aipt-service
   cloud:
     config:
-      #uri: http://${myuri}:8769
+      #uri: http://${myuri}:2011
       fail-fast: true
       discovery:
         enabled: true
@@ -14,6 +14,6 @@ spring:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://${myuri}:8761/eureka/
+      defaultZone: http://${myuri}:2012/eureka/
 
 myuri: localhost

config-server/src/main/resources/application.yml

@@ -33,7 +33,7 @@ spring:
 
 # port
 server:
-  port: 8769
+  port: 2011
 
 eureka:
   instance:
@@ -44,7 +44,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${myuri}:8761/eureka/
+      defaultZone: http://${myuri}:2012/eureka/
 
 management:
   endpoints:

config-server/src/main/resources/shared/aipt-service-local.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8845
+  port: 2015
 
 # 驱动配置信息
 spring:
@@ -7,9 +7,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.236:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://101.37.151.162:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
-      password: lantone
+      password: langtong
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -97,8 +97,8 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.226:5008
+    address: http://223.93.170.82:5008
 
 nlp:
   server:
-    address: http://192.168.2.226:5002
+    address: http://223.93.170.82:5002

config-server/src/main/resources/shared/gateway-service-local.yml

@@ -112,7 +112,7 @@ spring:
         - StripPrefix=2
 
 server:
-  port: 5050
+  port: 2013
 
 lantone:
   product: triage33,1;icsstt,2

config-server/src/main/resources/shared/icss-service-local.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8843
+  port: 2014
 
 # 驱动配置信息
 spring:
@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.239:3306/sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://101.37.151.162:3306/pingyang-sys-icss?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: langtong
       # 连接池的配置信息
@@ -75,8 +75,8 @@ spring:
   #redis
   redis:
     database:
-      cache: 15 # Redis缓存索引
-    host: 192.168.2.236  #Redis服务器地址
+      cache: 6 # Redis缓存索引
+    host: 118.31.77.177  #Redis服务器地址
     port: 6379 # Redis服务器连接端口
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
@@ -115,17 +115,3 @@ mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false
-#redis   
-redis:
-  database:
-    cache: 5 # Redis缓存索引
-    host: 192.168.2.236  #Redis服务器地址
-    port: 6379 # Redis服务器连接端口
-    password: lantone # Redis服务器连接密码（默认为空）
-    lettuce:
-      pool:
-        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
-        max-idle: 5 # 连接池中的最大空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-        min-idle: 0 # 连接池中的最小空闲连接
-    timeout: 20000 # 连接超时时间（毫秒）

config-server/src/main/resources/shared/tran-service-local.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8825
+  port: 2016
 
 # 驱动配置信息
 spring:
@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.239:3306/sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://101.37.151.162:3306/pingyang-sys-tran?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: langtong
       # 连接池的配置信息

eureka-server/src/main/resources/application-local.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8761
+  port: 2012
 eureka:
   client:
     register-with-eureka: false

gateway-service/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ spring:
     name: gateway-service
   cloud:
     config:
-#      uri: http://${myuri}:8769
+#      uri: http://${myuri}:2011
       fail-fast: true
       discovery:
         enabled: true
@@ -16,7 +16,7 @@ spring:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://${myuri}:8761/eureka/
+      defaultZone: http://${myuri}:2012/eureka/
 
 myuri: localhost
 

icss-service/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ spring:
     name: icss-service
   cloud:
     config:
-      #uri: http://${myuri}:8769
+      #uri: http://${myuri}:2011
       fail-fast: true
       discovery:
         enabled: true
@@ -14,6 +14,6 @@ spring:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://${myuri}:8761/eureka/
+      defaultZone: http://${myuri}:2012/eureka/
 
 myuri: localhost

tran-service/src/main/java/com/diagbot/web/remote/facade/PushFacade.java

@@ -37,10 +37,10 @@ public class PushFacade {
 	 * @return
 	 */
 	public Map<String, String> pushInquiry(PushInquiryVO pushInquiryVO){
-		String url=readProperties.getRemoteAddress()+"info_push.html?"+pushInquiryVO.toString();
+		String url=readProperties.getRemoteAddress()+"index.html?"+pushInquiryVO.toString();
 		
 		Map<String, String> map=new HashMap<String, String>();
-		map.put(url, url);
+		map.put("url", url);
 		return map;
 	}
 	
@@ -50,10 +50,9 @@ public class PushFacade {
 	 * @return
 	 */
 	public Map<String, String> pushDisease(@Valid @RequestBody PushDiseaseVO pushDiseaseVO){
-		String url=readProperties.getRemoteAddress()+"diag_push.html?"+pushDiseaseVO.toString();
-		
+		String url=readProperties.getRemoteAddress()+"index.html?"+pushDiseaseVO.toString();
 		Map<String, String> map=new HashMap<String, String>();
-		map.put(url, url);
+		map.put("url", url);
 		return map;
 	}
 }

tran-service/src/main/java/com/diagbot/web/remote/vo/PushDiseaseVO.java

@@ -9,23 +9,25 @@ import lombok.Setter;
 @Getter
 @Setter
 public class PushDiseaseVO {
-    
-	@NotBlank(message = "请输入疾病名称")
-	private String disJson;//疾病名称
+	@NotBlank(message = "请输入医院编码、ID")
+	private String hospitalCode; //医院编码、ID
 	
 	@NotNull(message = "请输入年龄")
 	private Long age;//年龄
 	
 	@NotBlank(message = "请输入性别")
-    private String sexType;//性别
+    private String sex;//性别
+	
+	@NotBlank(message = "请输入疾病名称")
+	private String diagJson;//疾病名称
 	
-    private String hospitalId; //医院编码、ID
+	//以下属性暂时不用
     private String deptId;//科室ID
     private String doctorId;//医生ID
     private String recordId; //就诊ID
     
     public String toString(){
-    	return "age="+this.age+"&sexType="+this.sexType+"&disJson="+this.disJson;
+    	return "hospitalCode="+this.hospitalCode+"&age="+this.age+"&sex="+this.sex+"&diagJson="+this.diagJson;
     }
     
 }

tran-service/src/main/java/com/diagbot/web/remote/vo/PushInquiryVO.java

@@ -9,32 +9,36 @@ import lombok.Setter;
 @Getter
 @Setter
 public class PushInquiryVO {
+	
+	@NotNull(message = "请输入医院编码")
+	private String hospitalCode; //医院编码
+	
 	@NotNull(message = "请输入年龄")
 	private Long age;
 	
 	@NotBlank(message = "请输入性别")
-    private String sexType;
+    private String sex;
 	
 	@NotBlank(message = "请输入主诉")
 	private String symptomJson;
 	
-	
-    private String pastJson;
-    private String otherJson;
-    private String vitalsJson;
-    private String labsJson;
-    private String pacsJson;
-    private String disJson;
-    private String drugJson;
+	private String vitalJson;//查体
+	private String lisJson;//检验
+	private String pacsJson;//检查
+	private String pastJson;//过往史
+    private String otherJson;//其他史
+    private String diagJson;//诊断
     
+    //暂时用不上
+    private String drugJson;
     private String type;
-    private String hospitalCode; //医院编码
     private String patientId;  //病人id
     private String recordId; //就诊序号
     
     @Override
 	public String toString() {
-		return "age="+this.age+"&sexType="+this.sexType+"&symptomJson="+ this.symptomJson+"";
+		return "hospitalCode="+this.hospitalCode+"&age="+this.age+"&sex="+this.sex+"&symptomJson="+ this.symptomJson+"&vitalJson="+ this.vitalJson
+				+"&lisJson="+ this.lisJson+"&pacsJson="+ this.pacsJson+"&pastJson="+ this.pastJson+"&otherJson="+ this.otherJson+"&diagJson="+ this.diagJson+"";
 	}
     
     

tran-service/src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ spring:
     name: tran-service
   cloud:
     config:
-      #uri: http://${myuri}:8769
+      #uri: http://${myuri}:2011
       fail-fast: true
       discovery:
         enabled: true
@@ -14,6 +14,6 @@ spring:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://${myuri}:8761/eureka/
+      defaultZone: http://${myuri}:2012/eureka/
 
 myuri: localhost

tran-service/src/main/resources/jdbc.properties

@@ -6,4 +6,4 @@ jdbc.password=root
 
 
 #\u6570\u636e\u670d\u52a1\u6a21\u5f0f
-remote.address=http://192.168.4.177:55/static/pages/
+remote.address=http://101.37.151.162:2009/