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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/concern/ConcernDao.java

@@ -37,6 +37,4 @@ public interface ConcernDao extends
    @Query("select count(id) from  ConcernDO  where   status=1  and  concernDoctorCode=?1")
    Integer countPatientsByDoctorCode(String doctorCode);
    @Query("select count(id) from  ConcernDO  where   concernDoctorCode=?1 group by patient")
    Integer countAllPatientsByDoctorCode(String doctorCode);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/concern/ConcernService.java

@@ -240,8 +240,20 @@ public class ConcernService extends BaseService {
     * @return
     */
    public Integer countAllPatientsByDoctorCode(String doctorCode) {
        Integer patients = concernDao.countAllPatientsByDoctorCode(doctorCode);
        String sql="SELECT " +
                "  count(*) " +
                "FROM " +
                "  ( " +
                "    SELECT " +
                "      id " +
                "    FROM " +
                "      wlyy_concern  " +
                "    WHERE " +
                "      concern_doctor_code = '"+doctorCode+"' " +
                "    GROUP BY " +
                "      patient " +
                "  ) t";
        Integer patients = jdbcTemplate.queryForObject(sql,Integer.class);
        return patients;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/family/FamilyService.java

@@ -58,7 +58,7 @@ public class FamilyService {
    @Autowired
    private ConsultService consultService;
    @Value("${wechat.message.doctor_invitel_template}")
   // @Value("${wechat.message.doctor_invitel_template}")
    private String templateId;
    @Value("${wechat.wechat_base_url}")
    private String wechat_base_url;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/task/PushMsgTask.java

@@ -29,6 +29,16 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.LinkedBlockingQueue;
/**
 * 个体推送及微信模板接口
 * ·配置及调用微信模板流程：
 * 1.配置yml对应的模板ID ，再此类中注入实体
 * 2.新增模板枚举类型enum pushType
 * 3.新增枚举与模板映射关系
 * 4.调用putWxMsg（WechatMsgVo wx）发送微信模板消息
 * ·个推系统消息：
 * 1.调用put方法即可.
 */
@Component
public class PushMsgTask {
@@ -45,24 +55,34 @@ public class PushMsgTask {
    @Value("${putMesType.wechat}")
    private String putMesType;
    //模板id
    //===微信模板配置流程：1.配置yml对应模板ID====
    @Value("${wechat.message.template_consult_notice}")
    private String template_consult_notice;
    @Value("${wechat.message.template_health_notice}")
    private String template_health_notice;
    @Value("${wechat.message.template_healthy_article}")
    private String template_healthy_article;
    @Value("${wechat.message.information_change_notice}")
    private String information_change_notice;
    @Value("${wechat.message.feedback_processing_notice}")
    private String feedback_processing_notice;
    //=======微信模板配置流程=======================
    @Autowired
    private WechatPushLogDao wechatPushLogDao;
    /**
     * 微信推送类型枚举
     * 微信模板配置流程：
     * 2.微信推送类型枚举
     * 新增模板在此添加枚举类型
     */
    public enum pushType{
        //dome,根据实际情况配置相应模板
        consult("咨询回复",1),
        health_education("健康教育",2);
        health_education("健康教育",2),
        healthy_article("患教通知",3),
        change_notice("信息变更",4),
        feedback_processing("反馈处理",5);
        private String name;
        private int value;
@@ -70,7 +90,6 @@ public class PushMsgTask {
            this.name = name;
            this.value = value;
        }
        public String getName() {
            return name;
        }
@@ -90,8 +109,8 @@ public class PushMsgTask {
    /**
     * 通过类型获取模板
     * 新增模板在此添加枚举类型与模板映射
     * 微信模板配置流程：
     * 3.通过类型获取模板，新增模板在此添加枚举类型与模板映射
     * @param type
     * @return
     */
@@ -101,6 +120,12 @@ public class PushMsgTask {
                return template_consult_notice;
            }else if(pushType.health_education.getValue()==type){
                return template_health_notice;
            }else if(pushType.healthy_article.getValue()==type){
                return template_healthy_article;
            }else if(pushType.change_notice.getValue()==type){
                return information_change_notice;
            }else if(pushType.feedback_processing.getValue()==type){
                return feedback_processing_notice;
            }else {
                return "";
            }
@@ -110,7 +135,8 @@ public class PushMsgTask {
    }
    /**
     * 微信消息接口
     * 微信模板调用接口
     * 1.微信消息接口
     */
    public void putWxMsg(WechatMsgVo wx) {
        try {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/template/ThirdTemplateController.java

@@ -28,9 +28,9 @@ public class ThirdTemplateController extends BaseController {
    private WeiXinTempMsgSendUtils tempMsgSendUtils;
    @Autowired
    private PushMsgTask pushMsgTask;
    @Value("${wechat.message.template_doctor_survey}")
//    @Value("${wechat.message.template_doctor_survey}")
    private String template_doctor_survey;
    @Value("${wechat.message.template_deal_with}")
//    @Value("${wechat.message.template_deal_with}")
    private String template_deal_with;
    /**

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

@@ -45,39 +45,16 @@ wechat:
  wechat_base_url: http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
  accId: gh_ffd64560fb21
  message:
   ##医生追加建议提醒 --签约邀请
   doctor_invitel_template: TLWrBtNE2kBJaFCdVzDOOnQC8N2TtRY9ZxEzwZXQcR0
   #咨询回复
   template_consult_notice: qSOW0DBxO3qEBm4ucG0Ial0jxsOyD7_f2TFK5e-mQEc
   #签约成功
   template_sign_success: hDWV_sknKlhxhOwR5h68OCXbAhRpcgnx9INrT8BybE8
   #签约失败
   template_sign_failed: ezgttXE7rG4rAboQK2ituG1dKq4PeyCj3LxGJWO_vOA
   template_consult_notice: -dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
   #健康指导提醒
   template_health_notice: 128RCfyCHi22jW8PZzo7vabKMsA3SBv5VeHaDPr2Bhw
   #解约提醒
   template_termination:  LrrzHjnIF67ww5uQUvSiv3_pVKJiIK4ZE3fKrvsT0AE
   #预约成功
   template_appoint_success:  Bo2yqNczSU9zkg4wXoouv9tSeefZ6TziggWL3dTXPYE
   #预约取消
   template_appoint_failed:  pErTBTdweIdrNRf_1Oo62YtQC0aHwPvtLaCzw44JzCQ
   #缴费提醒
   template_expenses_remind:  BkTGJ8S18qZ3DfaptAXnZznAk8RJjx9v93og5vyO0bs
   #健康教育
   template_healthy_article: LA7erINJ0CSsG2G_ZCrgsDaX3krhsI4qg_NSHEyL_l4
   #医生变更
   template_doctor_change:  TNIDMjduVKgVL4-k71umYLpHROvFB8K6mmm8aZC_EH8
   #问卷调查
   template_doctor_survey:  IjQvzBy0PLeft2kN9mdBhACXPE9I_jyJywJ6B-JRxsY
   #审核结果通知
   template_doctor_audit:  OFyLUeBW3r9trWw-i6pbB1sPSTD4J2recCv_mc-gKxA
   #服务结果通知
   template_doctor_service:  ezr5RlX0nvh7bGU9aVsGDMJbjKDp1uMKP-AGGYXwI5g
   #体检报告提醒
   template_physical_examination:  jTsvKU3iFw0yiJi5ESyFGDTmFSVcWlMot3yHier39Vc
   #处理结果通知
   template_deal_with:  VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
   template_health_notice: 5Nts8lA_at9Cd1JuTK-qDxx95lchpcmUfPTEwYDgXYQ
   #患教通知
   template_healthy_article: aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
   #信息变更通知
   information_change_notice: V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
   #反馈处理通知
   feedback_processing_notice: VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
yihu:
  yihu_OpenPlatform_url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
  yihu_OpenPlatform_appId: 9000276

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

@@ -48,39 +48,16 @@ wechat:
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  accId: gh_ffd64560fb21
  message:
    ##医生追加建议提醒 --签约邀请
    doctor_invitel_template:  uXdBJVbrhKG-WLaCG4s8C4SXSr2kknQ94vKFt-3rIiA
    #咨询回复
    template_consult_notice: dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
    #签约成功
    template_sign_success: VYGj8OUKj6FH4i4_nZS2UAHurJxQHx-7_OBPILIdB8s
    #签约失败
    template_sign_failed: m221Jrkm0UUY00ExTCpQNTB8t_1U_V4LR9Bg8BgH9-o
    #健康指导提醒
    template_health_notice: 5Nts8lA_at9Cd1JuTK-qDxx95lchpcmUfPTEwYDgXYQ
    #解约提醒
    template_termination:  qZm1NwSueAsbHaOf9DrnLoSj0X5gZuh9W7aDYzLWNds
    #预约成功
    template_appoint_success:  vU5x2tGyk1zUngBrEqMfnFqqMa6M8J98w8k5MCSUYM
    #预约取消
    template_appoint_failed:  r-bVEKgXVyl8O96saoJXlLd7DX1zW7fXA4a0PZHxiQM
    #缴费提醒
    template_expenses_remind:  pZby4Mz3H5angmjGTuvXzo9lwlaVfEiqORwI8soI-5E
    #健康教育
    template_healthy_article: aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
    #医生变更
    template_doctor_change:  V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
    #问卷调查
    template_doctor_survey:  OqQXrb-e43_TJpq_70_K_y6vYJgY5mpjFYY4c5RWFP4
    #审核结果通知
    template_doctor_audit:  lCtOgJgL1tBJbAytqN7cn-FgCH_Usg99FENEy2TrC08
    #服务结果通知
    template_doctor_service: i34rq3xFLnpf_VN2Jor9n2YlQqJMM7oXyYvuctriISw
    #体检报告提醒
    template_physical_examination:  tlsPJlgA90-I73j2QudyMG7C-LmrMn1lC4_UnJPyWSM
    #处理结果通知
    template_deal_with:  VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
   #咨询回复
   template_consult_notice: -dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
   #健康指导提醒
   template_health_notice: 5Nts8lA_at9Cd1JuTK-qDxx95lchpcmUfPTEwYDgXYQ
   #患教通知
   template_healthy_article: aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
   #信息变更通知
   information_change_notice: V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
   #反馈处理通知
   feedback_processing_notice: VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
yihu:
  yihu_OpenPlatform_url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/

patient-co/patient-co-wlyy/src/main/resources/application-prod.yml

@@ -45,40 +45,16 @@ wechat:
  wechat_base_url: http%3a%2f%2fwww.xmtyw.cn%2fwlyy
  accId: gh_733f975e0bed
  message:
   ##医生追加建议提醒 --签约邀请
   doctor_invitel_template: MQn79bx1ofb6hekhmRIuqLU7KjySJQzaBzrimgqVrzA
   #咨询回复
   template_consult_notice: 0mF_vHj-ILx8EH8DwzmAi7LqzjqYiU9IrSRRmziTZyc
   #签约成功
   template_sign_success: 0D2vYZVRzFz15p9Y_pkZ1DKutDq8UOsks79FXUKS0tA
   #签约失败
   template_sign_failed: My2VNERjJt4NXR4Ibh42pdrP6B6ka8rQxZeWinQh99s
   template_consult_notice: -dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
   #健康指导提醒
   template_health_notice: uv31ES_VCmq3tBYtyGmEQvIwU_zh9LDhF3bFpbIUt5g
   #解约提醒
   template_termination:  C0tdXtA_8k-Cy4a1EkzQuI877vqaqAtRkc-e_Gsd7sk
   #预约成功
   template_appoint_success:  FY3Pqa66tHIE1Fv-irbFBPOh5cYP71fkOzfZKH4S-Fo
   #预约取消
   template_appoint_failed:  tldWEb9AN7p_RoHoD8ml0GxWW3V1V_mpEEhp2v6p56s
   #缴费提醒
   template_expenses_remind:  AcrlihhoGbm22A8cdFFDQ4u38ptRw0aiIPf-aGvNxMM
   #健康教育
   template_healthy_article: a5-ZGf-IUUULsuRNoHWQiBMU6pSYhLgPPqV67SjdLRo
   #医生变更
   template_doctor_change:  dtzSHImbPKfwcrjWlJEjAw3lGlvrLjsobSOE8g4adZA
   #代办事项
   template_doctor_survey:  8ZWKJmoJ7VR7Uk4YS7aa0Z94QzCkxsyTW6R4CHhUJII
   #审核结果通知
   template_doctor_audit:  egrX5Larpkv8opQW67_hwsZoT0OHwwUpE1v7HeU_Jnw
   #服务结果通知
   template_doctor_service:  xhi1LEudiZwJfZylOHuZNo8EiA73GtSshPQv5XOt9Lk
   #体检报告提醒
   template_physical_examination:  jTsvKU3iFw0yiJi5ESyFGDTmFSVcWlMot3yHier39Vc
   #处理结果通知
   template_deal_with:  GyXCmXVYCD7PXi0IbHdPOD8apa-RQoSrSw-4-0pj9Go
   template_health_notice: 5Nts8lA_at9Cd1JuTK-qDxx95lchpcmUfPTEwYDgXYQ
   #患教通知
   template_healthy_article: aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
   #信息变更通知
   information_change_notice: V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
   #反馈处理通知
   feedback_processing_notice: VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
yihu:
  yihu_OpenPlatform_url: http://api.yihu.com.cn/OpenPlatform/cgiBin/1.0/
  yihu_OpenPlatform_appId: 9000276

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

@@ -42,39 +42,16 @@ wechat:
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  accId: gh_ffd64560fb21
  message:
   ##医生追加建议提醒 --签约邀请
   doctor_invitel_template: uXdBJVbrhKG-WLaCG4s8C4SXSr2kknQ94vKFt-3rIiA
   #咨询回复
   template_consult_notice: dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
   #签约成功
   template_sign_success: VYGj8OUKj6FH4i4_nZS2UAHurJxQHx-7_OBPILIdB8s
   #签约失败
   template_sign_failed: m221Jrkm0UUY00ExTCpQNTB8t_1U_V4LR9Bg8BgH9-o
   template_consult_notice: -dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
   #健康指导提醒
   template_health_notice: 5Nts8lA_at9Cd1JuTK-qDxx95lchpcmUfPTEwYDgXYQ
   #解约提醒
   template_termination:  qZm1NwSueAsbHaOf9DrnLoSj0X5gZuh9W7aDYzLWNds
   #预约成功
   template_appoint_success:  vU5x2tGyk1zUngBrEqMfnFqqMa6M8J98w8k5MCSUYM
   #预约取消
   template_appoint_failed:  r-bVEKgXVyl8O96saoJXlLd7DX1zW7fXA4a0PZHxiQM
   #缴费提醒
   template_expenses_remind:  pZby4Mz3H5angmjGTuvXzo9lwlaVfEiqORwI8soI-5E
   #健康教育
   #患教通知
   template_healthy_article: aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
   #医生变更
   template_doctor_change:  V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
   #问卷调查
   template_doctor_survey:  OqQXrb-e43_TJpq_70_K_y6vYJgY5mpjFYY4c5RWFP4
   #审核结果通知
   template_doctor_audit:  lCtOgJgL1tBJbAytqN7cn-FgCH_Usg99FENEy2TrC08
   #服务结果通知
   template_doctor_service:  i34rq3xFLnpf_VN2Jor9n2YlQqJMM7oXyYvuctriISw
   #体检报告提醒
   template_physical_examination:  tlsPJlgA90-I73j2QudyMG7C-LmrMn1lC4_UnJPyWSM
   #处理结果通知
   template_deal_with:  VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
   #信息变更通知
   information_change_notice: V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
   #反馈处理通知
   feedback_processing_notice: VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
yihu:
  yihu_OpenPlatform_url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
  yihu_OpenPlatform_appId: 9000276

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

@@ -64,7 +64,7 @@ redis:
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: false
  show_sql: true
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy