成都二院

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

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.16.1.102:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://10.5.55.29:3306/med?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lt@great
       # 连接池的配置信息
@@ -99,12 +99,12 @@ io.github.lvyahui8.spring.base-packages: com.diagbot.aggregate
 
 ai:
   server:
-    address: http://192.16.1.101:5008
+    address: http://10.5.55.40:5008
 
 nlp:
   server:
-    address: http://192.16.1.101:5002
+    address: http://10.5.55.40:5002
 
 aineo:
   server:
-    address: http://192.16.1.101:8888
+    address: http://10.5.55.40:8888

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

@@ -18,7 +18,7 @@ spring:
   redis:
     database:
       cache: 0 # Redis限流缓存索引
-    host: 192.16.1.101  #Redis服务器地址
+    host: 10.5.55.40  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
     lettuce:

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

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.16.1.102:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://10.5.55.29:3306/sys-log?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: lt@great
       # 连接池的配置信息

prec-service/src/main/java/com/diagbot/dto/GetInquiryDetailDTO.java

@@ -40,19 +40,19 @@ public class GetInquiryDetailDTO {
 	@ApiModelProperty(value="就诊时间")
 	private Date inquiryTime;
 
-    /**
-     * 病历创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value="病历创建时间")
-    private Date gmtCreate;
-
-    /**
-     * 病历更新时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @ApiModelProperty(value="病历更新时间")
-    private Date gmtModified;
+//    /**
+//     * 病历创建时间
+//     */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty(value="病历创建时间")
+//    private Date gmtCreate;
+//
+//    /**
+//     * 病历更新时间
+//     */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    @ApiModelProperty(value="病历更新时间")
+//    private Date gmtModified;
 	
 	/**
      * 医院id

prec-service/src/main/java/com/diagbot/dto/GetInquiryDetailImgDTO.java

@@ -18,5 +18,7 @@ public class GetInquiryDetailImgDTO {
 	 */
 	@ApiModelProperty(value="原图")
     private String originalImage;
+	@ApiModelProperty(value="原图")
+	private String narrowImage;
 
 }

tran-service/src/main/java/com/diagbot/dto/SignlnsDTO.java

@@ -0,0 +1,24 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+@Data
+public class SignlnsDTO {
+    private String hospitalCode;//	医院编码
+    private String hospitalName	;//医院名称
+    private String sonHospitalCode	;//子医院编号
+    private String sonHospitalName	;//子医院名称
+    private String hospitalDeptCode;//科室编码
+    private String hospitalDeptName	;//科室名称
+    private String doctorCode	;//医生编码
+    private String  doctorName;//	医生姓名
+    private String patientCode	;//患者编号
+    private String  patientName;//	患者姓名
+    private String  recordTime	;//挂号时间
+    private String recordId	;//就诊号
+    private String registerNum;//	挂号序号
+    private String sex	;//性别,1:男；2：女
+    private String  birthday	;//出生日期
+    private String identityNum	;//身份证号
+
+}

tran-service/src/main/java/com/diagbot/facade/PatientInfoDjFacade.java

@@ -40,6 +40,7 @@ import org.apache.http.util.EntityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 import springfox.documentation.spring.web.json.Json;
@@ -81,6 +82,7 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
     @Autowired
     private RestTemplate restTemplate;
 
+
     /**
      * 对接-页面顶部病人医生科室信息——查询
      *
@@ -391,6 +393,7 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
         }
     }
 
+
     /**
      * 对接---获取挂号信息
      * 某一时刻患者只可能在一家医院，所以获取到的挂号信息只能是当前医院的，当出现江干的大小医院情况时可采用2种：
@@ -403,19 +406,49 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
     private List<RegisterInfoDTO> getRegisterInfo(SignInVO signInVO) {
         List<RegisterInfoDTO> registerInfoDTOS = new ArrayList<>();
         //调用第三方的url
-        String url = "http://192.168.2.241:1234/a/a";
+        String url = "http://172.17.220.121:27772/cdyzone/rest/CDYZone.APPCON.BS.RestService";
         //调用第三方的入参并得到返回的出参
-        String json = doPostJson(url,JSONObject.toJSONString(signInVO));
+        String json = doPostJson(url, JSONObject.toJSONString(signInVO));
+        System.out.println("返回的JSON-------------" + json);
         //把返回的参数转换成需要的格式
-        RespDTO respDTO = JSONObject.parseObject(json,RespDTO.class);
-        if (respDTO.code.equals("0")){
-            List<SignInDTO> signInDTOS= JSONObject.parseArray(JSONObject.toJSONString(respDTO.data),SignInDTO.class);
+        RespDTO respDTO = JSONObject.parseObject(json, RespDTO.class);
+        if (respDTO.code.equals("0")) {
+            List<SignlnsDTO> signInDTOS = JSONObject.parseArray(JSONObject.toJSONString(respDTO.data), SignlnsDTO.class);
             signInDTOS.forEach(signInDTO -> {
+                //病人信息
+                PatientInfo patientInfo = new PatientInfo();
+                patientInfo.setCode(!signInDTO.getPatientCode().isEmpty() ? signInDTO.getPatientCode() : "");
+                patientInfo.setHospitalCode(!signInDTO.getHospitalCode().isEmpty() ? signInDTO.getHospitalCode() : "");
+                patientInfo.setSex(Integer.valueOf(!signInDTO.getSex().isEmpty() ? signInDTO.getSex() : ""));
+                patientInfo.setName(!signInDTO.getPatientName().isEmpty() ? signInDTO.getPatientName() : "");
+                patientInfo.setBirthday(DateUtil.parseDate(!signInDTO.getBirthday().isEmpty() ? signInDTO.getBirthday() : ""));
+                patientInfo.setIdentityNum(!signInDTO.getIdentityNum().isEmpty() ? signInDTO.getIdentityNum() : "");
+                //医生信息
+                DoctorInfo doctorInfo = new DoctorInfo();
+                doctorInfo.setHospitalCode(!signInDTO.getHospitalCode().isEmpty() ? signInDTO.getHospitalCode() : "");
+                doctorInfo.setHospitalDeptCode(!signInDTO.getHospitalDeptCode().isEmpty() ? signInDTO.getHospitalDeptCode() : "");
+                doctorInfo.setSex(Integer.valueOf(!signInDTO.getSex().isEmpty() ? signInDTO.getSex() : ""));
+                doctorInfo.setName(!signInDTO.getDoctorName().isEmpty() ? signInDTO.getDoctorName() : "");
+                doctorInfo.setCode(!signInDTO.getDoctorCode().isEmpty() ? signInDTO.getDoctorCode() : "");
+                //病人详情
+                List<RegisterInfoDetailDTO> detail = new ArrayList<>();
+                RegisterInfoDetailDTO registerInfoDetailDTO = new RegisterInfoDetailDTO();
+                registerInfoDetailDTO.setDoctorInfo(doctorInfo);
+                registerInfoDetailDTO.setRecordTime(!signInDTO.getRecordTime().isEmpty()?signInDTO.getRecordTime():"");
+                registerInfoDetailDTO.setRegisterNum(!signInDTO.getRegisterNum().isEmpty() ? signInDTO.getRegisterNum() : "");
+                registerInfoDetailDTO.setHospitalDeptName(!signInDTO.getHospitalDeptName().isEmpty() ? signInDTO.getHospitalDeptName() : "");
+                registerInfoDetailDTO.setRecordId(!signInDTO.getRecordId().isEmpty() ? signInDTO.getRecordId() : "");
+                registerInfoDetailDTO.setRegisterNum(!signInDTO.getRegisterNum().isEmpty() ? signInDTO.getRegisterNum() : "");
+                registerInfoDetailDTO.setHospitalDeptCode(!signInDTO.getHospitalDeptCode().isEmpty() ? signInDTO.getHospitalDeptCode() : "");
+                detail.add(registerInfoDetailDTO);
+                //医院挂号信息
                 RegisterInfoDTO registerInfoDTO = new RegisterInfoDTO();
-                PatientInfo patientInfo =new PatientInfo();
-                BeanUtil.copyProperties(signInDTO,patientInfo);
-                BeanUtil.copyProperties(signInDTO,registerInfoDTO);
+                registerInfoDTO.setHospitalCode(!signInDTO.getHospitalCode().isEmpty() ? signInDTO.getHospitalCode() : "");
+                registerInfoDTO.setHospitalName(!signInDTO.getHospitalName().isEmpty() ? signInDTO.getHospitalName() : "");
+                registerInfoDTO.setSonHospitalCode(!signInDTO.getHospitalCode().isEmpty() ? signInDTO.getHospitalCode() : "");
+                registerInfoDTO.setSonHospitalName(!signInDTO.getHospitalName().isEmpty() ? signInDTO.getHospitalName() : "");
                 registerInfoDTO.setPatientInfo(patientInfo);
+                registerInfoDTO.setDetail(detail);
                 registerInfoDTOS.add(registerInfoDTO);
             });
         }
@@ -424,6 +457,7 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
 
     /**
      * 调用
+     *
      * @param url
      * @param json
      * @return