Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -2185,7 +2185,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            sql+=" JOIN wlyy_doctor_work_time wk on wk.doctor = d.id ";
        }
        sql +=  " WHERE  " +
                " h.org_code = '"+orgCode+"'";
                " d.charge_type is not null and  h.org_code = '"+orgCode+"'";
        if(StringUtils.isNotBlank(diseaseKey)){
            sql+=" AND d.expertise like '%"+diseaseKey+"%'";
        }

svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@@ -70,6 +70,8 @@ hospital:
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: im_internet_hospital
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
---
spring:
  profiles: jwtest
@@ -90,6 +92,8 @@ hospital:
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: im_internet_hospital
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
---
spring:
  profiles: jwprod
@@ -109,4 +113,6 @@ hospital:
  TargetSysCode: S01
im:
  im_list_get: http://172.16.1.42:3000/
  data_base_name: im
  data_base_name: im
fastDFS:
  fastdfs_file_url: http://192.0.33.26:8888/

svr/svr-internet-hospital-job/src/main/resources/application.yml

@@ -74,7 +74,8 @@ hospital:
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: im_internet_hospital
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
---
spring:
  profiles: jwtest
@@ -97,6 +98,8 @@ hospital:
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: im_internet_hospital
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
---
spring:
  profiles: jwprod
@@ -119,3 +122,5 @@ hospital:
im:
  im_list_get: http://172.16.1.42:3000/
  data_base_name: im
fastDFS:
  fastdfs_file_url: http://192.0.33.26:8888/