Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/account/CustomerService.java

@@ -643,10 +643,11 @@ public class CustomerService extends BaseService{
		manageSynergyWorkorderServicerDO.setCode(UUID.randomUUID().toString());
		manageSynergyWorkorderServicerDO.setServicePatientCode(callService.getPatient());
		manageSynergyWorkorderServicerDO.setServicePatientName(callService.getPatientName());
		manageSynergyWorkorderServicerDO.setExecutorType(1);
		manageSynergyWorkorderServicerDao.save(manageSynergyWorkorderServicerDO);
		
		manageSynergyWorkorderExecutorDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
		manageSynergyWorkorderExecutorDO.setDel(0);
		manageSynergyWorkorderExecutorDO.setDel(1);
		manageSynergyWorkorderExecutorDO.setExecutorType(3);
		manageSynergyWorkorderExecutorDO.setExecutorCode(callService.getUser());
		manageSynergyWorkorderExecutorDO.setExecutorName(callService.getUserName());
@@ -730,10 +731,11 @@ public class CustomerService extends BaseService{
		manageSynergyWorkorderServicerDO.setServicePatientCode(callService.getPatient());
		manageSynergyWorkorderServicerDO.setServicePatientName(callService.getPatientName());
		manageSynergyWorkorderServicerDO.setCreateTime(new Date());
		manageSynergyWorkorderServicerDO.setExecutorType(1);
		manageSynergyWorkorderServicerDao.save(manageSynergyWorkorderServicerDO);
		
		manageSynergyWorkorderExecutorDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
		manageSynergyWorkorderExecutorDO.setDel(0);
		manageSynergyWorkorderExecutorDO.setDel(1);
		manageSynergyWorkorderExecutorDO.setExecutorType(3);
		manageSynergyWorkorderExecutorDO.setExecutorCode(callService.getUser());
		manageSynergyWorkorderExecutorDO.setExecutorName(callService.getUserName());

patient-co/patient-co-wlyy-job/src/main/resources/application-dev.yml

@@ -34,12 +34,20 @@ im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: ichat
#wechat:
#  appId: wxd03f859efdf0873d
#  appSecret: 2935b54b53a957d9516c920a544f2537
#  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
#  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
#  accId: gh_ffd64560fb21
wechat:
  appId: wxd03f859efdf0873d
  appSecret: 2935b54b53a957d9516c920a544f2537
  appId: wxddece6347fe7fe87
  #appSecret: 988f005d8309ed1795939e0f042431fb
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  #accId: gh_ffd64560fb21
  appSecret: 41ade403de3d0e2e450f54a324ec013a
  accId: gh_710bf0b315a1
  message:
   ##医生追加建议提醒 --签约邀请
   doctor_invitel_template: TLWrBtNE2kBJaFCdVzDOOnQC8N2TtRY9ZxEzwZXQcR0

patient-co/patient-co-wlyy-job/src/main/resources/application-devtest.yml

@@ -34,12 +34,20 @@ im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: im_new
#wechat:
#  appId: wx1f129f7b51701428
#  appSecret: 988f005d8309ed1795939e0f042431fb
#  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
#  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
#  accId: gh_ffd64560fb21
wechat:
  appId: wx1f129f7b51701428
  appSecret: 988f005d8309ed1795939e0f042431fb
  appId: wxddece6347fe7fe87
  #appSecret: 988f005d8309ed1795939e0f042431fb
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  accId: gh_ffd64560fb21
  #accId: gh_ffd64560fb21
  appSecret: 41ade403de3d0e2e450f54a324ec013a
  accId: gh_710bf0b315a1
  message:
    ##医生追加建议提醒 --签约邀请
    doctor_invitel_template:  uXdBJVbrhKG-WLaCG4s8C4SXSr2kknQ94vKFt-3rIiA

patient-co/patient-co-wlyy-job/src/main/resources/application-test.yml

@@ -35,12 +35,21 @@ im:
  im_list_get: http://172.19.103.88:3000/
  data_base_name: im_new
#wechat:
#  appId: wx1f129f7b51701428
#  appSecret: 988f005d8309ed1795939e0f042431fb
#  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
#  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
#  accId: gh_ffd64560fb21
wechat:
  appId: wx1f129f7b51701428
  appSecret: 988f005d8309ed1795939e0f042431fb
  appId: wxddece6347fe7fe87
  #appSecret: 988f005d8309ed1795939e0f042431fb
  wechat_token: 27eb3bb24f149a7760cf1bb154b08040
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  accId: gh_ffd64560fb21
  #accId: gh_ffd64560fb21
  appSecret: 41ade403de3d0e2e450f54a324ec013a
  accId: gh_710bf0b315a1
  message:
   ##医生追加建议提醒 --签约邀请
   doctor_invitel_template: YA8VtN_JYORLHrbEhQkNoRjlpJXIGVGnb4_OhVq4OBs