Browse Source

代码修改

LAPTOP-KB9HII50\70708 4 months ago
parent
commit
07c8c8f1bb

+ 4 - 1
svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/rehabilitation/RehabilitationManageService.java

@ -689,9 +689,11 @@ public class RehabilitationManageService {
        String sql = "select h.name as title,h.content as content,h.code as itemType,d.id,d.execute_time,d.hospital_name,d.status,d.type,d.expense,d.doctor as executeDoctor, " +
                " d.doctor_name as executeDoctorName,p.patient ,p.name as patientName,p.create_user as createDoctor,p.create_user_name as createDoctorName, p.status as planStatus," +
                " p.disease,p.disease_name as diseaseName,p.title as planTitle,d.plan_id as planId,d.relation_code as relationCode,d.frequency_code as frequencyCode,d.remark  " +
                " ,a.appointment_time appointmentTime,a.appointment_doctor appointmentDoctor,a.appointment_doctor_name appointmentDoctorName,d.reservation_type reservationType,d.followup_detail_type followupDetailType " +
                " ,a.appointment_time appointmentTime,a.appointment_doctor appointmentDoctor,a.appointment_doctor_name appointmentDoctorName" +
                ",d.reservation_type reservationType,d.followup_detail_type followupDetailType,f.visit_count visitCount " +
                " from wlyy_specialist.wlyy_rehabilitation_plan_detail d " +
                " LEFT JOIN wlyy_specialist.wlyy_rehabilitation_service_item h on d.hospital_service_item_id = h.code " +
                " LEFT JOIN wlyy.wlyy_followup f on f.id=d.relation_code and d.hospital_service_item_id='6' " +
                " LEFT JOIN wlyy_specialist.wlyy_patient_rehabilitation_plan p on d.plan_id=p.id " +
                " LEFT JOIN wlyy_specialist.wlyy_plan_detail_appointment a on d.id=.a.rehabilitation_plan_detail_id " +
                " where d.id = '" + planDetailId + "'";
@ -720,6 +722,7 @@ public class RehabilitationManageService {
//        }
        executeDoctorList.add(one.get("executeDoctorName") + "");//
        resultMap.put("remark", one.get("remark"));//备注
        resultMap.put("visitCount", one.get("visitCount"));//方式次数
        resultMap.put("executeDoctorList", executeDoctorList);//执行医生名称列表
        resultMap.put("executeDoctorCode", one.get("executeDoctor") + "");//执行医生code
        resultMap.put("executeDoctorName", one.get("executeDoctorName") + "");//执行医生名称

+ 6 - 6
svr/svr-wlyy-specialist/src/main/resources/application.yml

@ -215,13 +215,13 @@ im:
spring:
  profiles: prod
  datasource:
    url: jdbc:mysql://59.61.92.90:9069/wlyy_specialist?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    url: jdbc:mysql://10.90.32.3:20002/wlyy_specialist?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: wlyy_new
    password: J4&y9sk#1G
    password: '@TaVAj%LEK@vB2J4&y9sk@TaVAj%LEK'
  redis:
    host: 59.61.92.90 # Redis server host.
    port: 9054 # Redis server port.
    password: jkzlehr
    host: 10.90.32.3 # Redis server host.
    port: 22142 # Redis server port.
    password: o!a1#B74&m
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
@ -231,7 +231,7 @@ fast-dfs:
neiwang:
  enable: false
  wlyy: http://59.61.92.90:9099/iot/
  wlyy: http://10.90.32.3:9099/iot/
base:
  url: http://192.168.120.96:10020/svr-base/