Merge branch 'dev' of zd_123/patient-co-management into dev

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/JMService.java

@@ -42,7 +42,7 @@ public class JMService {
    private String FIND_MY_VACCIN="findMyVaccin";
    private String FIND_CHILDREN = "findChildren";
    private String FIND_DEPT="findDept";//获取接种门诊
    private String FIND_WZYM_BY_MYKH="findWzymBymykh";
    private String FIND_WZYM_BY_MYKH="findYzymBymykh";
    private String redis_key ="imm:imm_token_key";
@@ -449,11 +449,16 @@ public class JMService {
     * @return
     */
    public String getToken() throws Exception  {
        String result = "";
        Map<String,String> params = new HashMap<>();
        params.put("act", GET_TOKEN);
        params.put("accId", accId);
        return ylzImmGetSecond("getToken","计免预约-获取口令",params);
        String token = redisTemplate.opsForValue().get(redis_key);
        if (StringUtils.isEmpty(token)){
            Map<String,String> params = new HashMap<>();
            params.put("act", GET_TOKEN);
            params.put("accId", accId);
            return ylzImmGetSecond("getToken","计免预约-获取口令",params);
        }else {
            return token;
        }
    }
    /**
@@ -493,7 +498,7 @@ public class JMService {
        params.put("act", FIND_MY_VACCIN);
        params.put("accId", accId);
        params.put("token", getTokenCheck());
        params.put("token_ylz", getTokenCheck());
        params.put("deptNum",deptNum);
        params.put("etmykh", etmykh);
        //params.put("etmykh", "0052182708");
@@ -511,7 +516,7 @@ public class JMService {
        Map<String,String> params = new HashMap<>();
        params.put("act", FIND_DEPT);
        params.put("accId", accId);
        params.put("token", getTokenCheck());
        params.put("token_ylz", getTokenCheck());
        params.put("etmykh", etmykh);
        //params.put("etmykh", "0052182708");
        return ylzImmGetSecond(FIND_DEPT,"计免预约-获取接种门诊",params);
@@ -528,7 +533,7 @@ public class JMService {
        Map<String,String> params = new HashMap<>();
        params.put("act", FIND_WZYM_BY_MYKH);
        params.put("accId", accId);
        params.put("token", getTokenCheck());
        params.put("token_ylz", getTokenCheck());
        params.put("etmykh", etmykh);
        //params.put("etmykh", "0052182708");
        /*params.put("act", "findWzymBymykh");

patient-co-service/wlyy_service/src/main/resources/application.yml

@@ -76,7 +76,7 @@ im:
  data_base_name: im_new
imm:
  url: imm
  url: jhmy
  credential: <root><org code="jkzl" /><visitor type="0" code="jkzl" key="jkzl" /></root>
zyapi:
@@ -121,7 +121,7 @@ im:
  data_base_name: im_new
imm:
  url: imm
  url: jhmy
  credential: <root><org code="jkzl" /><visitor type="0" code="jkzl" key="jkzl" /></root>
zyapi:
@@ -165,7 +165,7 @@ im:
  data_base_name: im_new
imm:
  url: imm
  url: jhmy
  credential: <root><org code="jkzl" /><visitor type="0" code="jkzl" key="jkzl" /></root>
zyapi:

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

@@ -348,9 +348,10 @@ public class PushMsgTask {
            case 5:
                templateId = template_sign_request;
                break;
            case 6:
                //@TODO  以后需要了释放出来 要做易联众对接支付消息
            /*case 6:
                templateId = template_followup_success;
                break;
                break;*/
            case 7:
                templateId = template_treatment_result;
                break;

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentMysqlToEsQuotaJob.java

@@ -119,6 +119,17 @@ public class CurrentMysqlToEsQuotaJob implements Job {
        this.incrementInterval = map.get("incrementInterval")!=null?String.valueOf(map.get("incrementInterval")):"1";
        //初始化统计年份
        this.year = getNowYearByDate();
        if (StringUtils.isEmpty(endTime)) {
            endTime = new LocalDate(new DateTime().minusDays(1)).toString("yyyy-MM-dd") + " 17:00:00"; //2017-06-01 17:00:00
        } else if (endTime.length()==10){
            endTime = endTime + " 17:00:00";
        }
        if("2".equals(incrementInterval)){
            endTime =  DateUtil.getSundayOfThisDate(DateUtil.strToDateLong(endTime));
        }else if("3".equals(incrementInterval)){
            endTime=  DateUtil.getLastDayOfMonth((DateUtil.strToDateLong(endTime)));
        }
        //初始化开始时间
        if ("2".equals(timeLevel)) {
            //按年度到达量
@@ -424,7 +435,7 @@ public class CurrentMysqlToEsQuotaJob implements Job {
    public void getStartTime() throws Exception{
        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
        if("1".equals(this.incrementInterval)){//日
            startTime = new LocalDate(new DateTime().minusDays(2)).toString("yyyy-MM-dd") + " 17:00:00";
            startTime = new LocalDate(new DateTime().minusDays(1)).toString("yyyy-MM-dd") + " 17:00:00";
        }else if("2".equals(this.incrementInterval)){//周
            Date monday = DateUtil.getMondayOfThisDayToDate(sf.parse(endTime));
//            startTime =sf.format(monday)+ " 17:00:00";

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

@@ -781,7 +781,9 @@ public class PushMsgTask {
                keyword3.setColor("#000000");
                keyword3.setValue(json.getString("keyword3"));
                m.put("keyword3", keyword3);
            }else if (type == 21) {
            }
            //@TODO 以后需要了释放出来 要做易联众对接支付消息
            /*else if (type == 21) {
                if (json.has("url")) {
                    temp.setUrl(url + json.getString("url"));
                }
@@ -806,7 +808,7 @@ public class PushMsgTask {
                keyword5.setColor("#000000");
                keyword5.setValue(json.getString("keyword5"));
                m.put("keyword5", keyword5);
            }else if (type == 22) {//设备绑定
            }*/else if (type == 22) {//设备绑定
                if (json.has("url")) {
                    temp.setUrl(url + json.getString("url"));
                }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/controller/doctor/GcMessageController.java

@@ -1,12 +1,14 @@
package com.yihu.wlyy.web.third.gateway.controller.doctor;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.SignFamily;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.service.common.SMSService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.util.NetworkUtil;
import com.yihu.wlyy.web.third.gateway.vo.base.BaseResultModel;
import com.yihu.wlyy.web.third.gateway.vo.base.ResultBatchModel;
import com.yihu.wlyy.web.third.gateway.vo.base.ResultOneModel;
import com.yihu.wlyy.wechat.util.WeiXinTempMsgSendUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -52,6 +54,13 @@ public class GcMessageController {
    @Value("${server.server_url}")
    private String server_url;
    @Value("${wechat.message.template_to_be_pay}")
    private String template_to_be_pay;
    @Value("${wechat.message.template_pay_success}")
    private String template_pay_success;
    @RequestMapping(value = "/sendWXTemplate", method = RequestMethod.POST)
    @ApiOperation("给患者发送微信模板消息")
    public ResultBatchModel sendWXTemplate(

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

@@ -98,6 +98,10 @@ wechat:
   template_patient_bind_device: 1GWPw6LFcSuz2LFTo6LhE-YY8abtmcKRvor1fUzfxBE
    #积分到账通知
   template_healthbank_credit: A2L6WBm1p6bDPYGkGnUmoMvpWlRruP2lapYwHfLV7Rg
   #支付提醒
   template_to_be_pay: Y5d-V3qW78ThFEi_DuepFdZ3dn1FpHeL2NzH0ilw-qM
   #支付成功通知
   template_pay_success: wetf1x_yZ7iKu6wRIld6KMXCO3NVase4VvhQrQxNWEo
  imgUrl:
    #居民wifi图片地址
    patient_wifi_pic_url: group1/M00/00/B0/Cl8WjVtgHqaAcNKWAABYgyiykZs906.png

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

@@ -99,6 +99,10 @@ wechat:
    template_patient_bind_device: 1GWPw6LFcSuz2LFTo6LhE-YY8abtmcKRvor1fUzfxBE
    #积分到账通知
    template_healthbank_credit: A2L6WBm1p6bDPYGkGnUmoMvpWlRruP2lapYwHfLV7Rg
    #支付提醒
    template_to_be_pay: Y5d-V3qW78ThFEi_DuepFdZ3dn1FpHeL2NzH0ilw-qM
    #支付成功通知
    template_pay_success: wetf1x_yZ7iKu6wRIld6KMXCO3NVase4VvhQrQxNWEo
  imgUrl:
    #居民wifi图片地址
    patient_wifi_pic_url: group1/M00/0E/F7/rBFuWltgKzGAKylNAABYgyiykZs261.png

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

@@ -91,7 +91,10 @@ wechat:
   template_patient_bind_device: 1GWPw6LFcSuz2LFTo6LhE-YY8abtmcKRvor1fUzfxBE
   #积分到账通知
   template_healthbank_credit: A2L6WBm1p6bDPYGkGnUmoMvpWlRruP2lapYwHfLV7Rg
   #支付提醒
   template_to_be_pay: Y5d-V3qW78ThFEi_DuepFdZ3dn1FpHeL2NzH0ilw-qM
   #支付成功通知
   template_pay_success: wetf1x_yZ7iKu6wRIld6KMXCO3NVase4VvhQrQxNWEo
yihu:
  yihu_OpenPlatform_url: http://api.yihu.com.cn/OpenPlatform/cgiBin/1.0/

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

@@ -86,6 +86,10 @@ wechat:
    template_physical_examination:  tlsPJlgA90-I73j2QudyMG7C-LmrMn1lC4_UnJPyWSM
    #处理结果通知
    template_deal_with:  VagkqFW_LFqLKE3gP2wmPtUfDWQOah40XMloipfi1do
    #支付提醒
    template_to_be_pay: Y5d-V3qW78ThFEi_DuepFdZ3dn1FpHeL2NzH0ilw-qM
    #支付成功通知
    template_pay_success: wetf1x_yZ7iKu6wRIld6KMXCO3NVase4VvhQrQxNWEo
yihu:

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

@@ -96,6 +96,10 @@ wechat:
    template_patient_bind_device: 1GWPw6LFcSuz2LFTo6LhE-YY8abtmcKRvor1fUzfxBE
    #积分到账通知
    template_healthbank_credit: A2L6WBm1p6bDPYGkGnUmoMvpWlRruP2lapYwHfLV7Rg
    #支付提醒
    template_to_be_pay: KQntAQWF1IknVa0zARlHvaNJy3Sa9i5xsENowKlA5AI
    #支付成功通知
    template_pay_success: EJovl6oiKVB0DqxLF37zbZn_6qXR-wfOnpNfBnLP1S8
  imgUrl:
    #居民wifi图片地址
    patient_wifi_pic_url: group1/M00/00/B0/Cl8WjVtgHqaAcNKWAABYgyiykZs906.png

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

@@ -91,6 +91,10 @@ wechat:
   template_patient_bind_device: 1GWPw6LFcSuz2LFTo6LhE-YY8abtmcKRvor1fUzfxBE
   #积分到账通知
   template_healthbank_credit: A2L6WBm1p6bDPYGkGnUmoMvpWlRruP2lapYwHfLV7Rg
   #支付提醒
   template_to_be_pay: Y5d-V3qW78ThFEi_DuepFdZ3dn1FpHeL2NzH0ilw-qM
   #支付成功通知
   template_pay_success: wetf1x_yZ7iKu6wRIld6KMXCO3NVase4VvhQrQxNWEo
  imgUrl:
    #居民wifi图片地址
    patient_wifi_pic_url: group1/M00/0E/F7/rBFuWltgKzGAKylNAABYgyiykZs261.png