소스 검색

bug修改

chenweida 7 년 전
부모
커밋
5c0cfa27f1

+ 18 - 18
patient-co/patient-co-doctor-assistant/src/main/resources/application-local.yml

@ -32,24 +32,24 @@ wechat:
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  accId: gh_aa9cd602b84b
  message:
    ##处方待处理提醒
    template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik
    ##服务状态提醒
    template_consult_notice: 5eOa_Wx60tqsbuQK7ITTgRXB-8SntBONvopai_HFnhY
    #居民体征异常提醒
    template_abnormal_signs: 5i4OuDef0Bzk3SBD9iuhOGqoCH0OSaH3HYIC8Sgg-yA
    #咨询请求通知
    template_consult_request: TeiAPgxC7JTVfWa24fkemlJ8Nvji_NCPYmxKzXql05A
    #签约申请通知
    template_sign_request: 7zB0Qf4nUEZlkGnoElmx8I4Q5dm0Gq9JZP6PCzl9b7s
    #随访提醒
    template_followup_success: -9blCMt1b7t24biL7QbkmQH0KWLgOIDQ5LtyX_Ai49E
    #处理结果通知
    template_treatment_result: J3W3-ZGZ5miHd0Ka1JLaXCYkIoCdiuJ-c527PH5nPQI
    #咨询回复提醒
    template_consult_reply: x7fIXWcd1YsXAnwhP-gmW1D__GtzD39j5KZLudoe0Y0
    #代办事项提醒
    template_schedule_remind: z32DERzD6X4ShOl86sI3YCOWl-lkr5Z9sKh1w_YG8Bs
   ##处方待处理提醒
   template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik
   ##服务状态提醒
   template_consult_notice: 5eOa_Wx60tqsbuQK7ITTgRXB-8SntBONvopai_HFnhY
   #居民体征异常提醒
   template_abnormal_signs: 5i4OuDef0Bzk3SBD9iuhOGqoCH0OSaH3HYIC8Sgg-yA
   #咨询请求通知
   template_consult_request: TeiAPgxC7JTVfWa24fkemlJ8Nvji_NCPYmxKzXql05A
   #签约申请通知
   template_sign_request: 7zB0Qf4nUEZlkGnoElmx8I4Q5dm0Gq9JZP6PCzl9b7s
   #随访提醒
   template_followup_success: -9blCMt1b7t24biL7QbkmQH0KWLgOIDQ5LtyX_Ai49E
   #处理结果通知
   template_treatment_result: J3W3-ZGZ5miHd0Ka1JLaXCYkIoCdiuJ-c527PH5nPQI
   #咨询回复提醒
   template_consult_reply: x7fIXWcd1YsXAnwhP-gmW1D__GtzD39j5KZLudoe0Y0
   #代办事项提醒
   template_schedule_remind: z32DERzD6X4ShOl86sI3YCOWl-lkr5Z9sKh1w_YG8Bs
yihu:

+ 18 - 18
patient-co/patient-co-doctor-assistant/src/main/resources/application-localtest.yml

@ -32,24 +32,24 @@ wechat:
  wechat_base_url: http%3a%2f%2fehr.yihu.com%2fwlyy
  accId: gh_aa9cd602b84b
  message:
    ##处方待处理提醒
    template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik
    ##服务状态提醒
    template_consult_notice: 5eOa_Wx60tqsbuQK7ITTgRXB-8SntBONvopai_HFnhY
    #居民体征异常提醒
    template_abnormal_signs: 5i4OuDef0Bzk3SBD9iuhOGqoCH0OSaH3HYIC8Sgg-yA
    #咨询请求通知
    template_consult_request: TeiAPgxC7JTVfWa24fkemlJ8Nvji_NCPYmxKzXql05A
    #签约申请通知
    template_sign_request: 7zB0Qf4nUEZlkGnoElmx8I4Q5dm0Gq9JZP6PCzl9b7s
    #随访提醒
    template_followup_success: -9blCMt1b7t24biL7QbkmQH0KWLgOIDQ5LtyX_Ai49E
    #处理结果通知
    template_treatment_result: J3W3-ZGZ5miHd0Ka1JLaXCYkIoCdiuJ-c527PH5nPQI
    #咨询回复提醒
    template_consult_reply: x7fIXWcd1YsXAnwhP-gmW1D__GtzD39j5KZLudoe0Y0
    #代办事项提醒
    template_schedule_remind: z32DERzD6X4ShOl86sI3YCOWl-lkr5Z9sKh1w_YG8Bs
   ##处方待处理提醒
   template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik
   ##服务状态提醒
   template_consult_notice: 5eOa_Wx60tqsbuQK7ITTgRXB-8SntBONvopai_HFnhY
   #居民体征异常提醒
   template_abnormal_signs: 5i4OuDef0Bzk3SBD9iuhOGqoCH0OSaH3HYIC8Sgg-yA
   #咨询请求通知
   template_consult_request: TeiAPgxC7JTVfWa24fkemlJ8Nvji_NCPYmxKzXql05A
   #签约申请通知
   template_sign_request: 7zB0Qf4nUEZlkGnoElmx8I4Q5dm0Gq9JZP6PCzl9b7s
   #随访提醒
   template_followup_success: -9blCMt1b7t24biL7QbkmQH0KWLgOIDQ5LtyX_Ai49E
   #处理结果通知
   template_treatment_result: J3W3-ZGZ5miHd0Ka1JLaXCYkIoCdiuJ-c527PH5nPQI
   #咨询回复提醒
   template_consult_reply: x7fIXWcd1YsXAnwhP-gmW1D__GtzD39j5KZLudoe0Y0
   #代办事项提醒
   template_schedule_remind: z32DERzD6X4ShOl86sI3YCOWl-lkr5Z9sKh1w_YG8Bs
yihu:

+ 18 - 18
patient-co/patient-co-doctor-assistant/src/main/resources/application-test.yml

@ -31,24 +31,24 @@ wechat:
  wechat_base_url: http%3a%2f%2fwww.xmtyw.cn%2fassistant
  accId: gh_aa9cd602b84b
  message:
     ##处方待处理提醒
     template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik
     ##服务状态提醒
     template_consult_notice: 5eOa_Wx60tqsbuQK7ITTgRXB-8SntBONvopai_HFnhY
     #居民体征异常提醒
     template_abnormal_signs: 5i4OuDef0Bzk3SBD9iuhOGqoCH0OSaH3HYIC8Sgg-yA
     #咨询请求通知
     template_consult_request: TeiAPgxC7JTVfWa24fkemlJ8Nvji_NCPYmxKzXql05A
     #签约申请通知
     template_sign_request: 7zB0Qf4nUEZlkGnoElmx8I4Q5dm0Gq9JZP6PCzl9b7s
     #随访提醒
     template_followup_success: -9blCMt1b7t24biL7QbkmQH0KWLgOIDQ5LtyX_Ai49E
     #处理结果通知
    template_treatment_result: J3W3-ZGZ5miHd0Ka1JLaXCYkIoCdiuJ-c527PH5nPQI
     #咨询回复提醒
     template_consult_reply: x7fIXWcd1YsXAnwhP-gmW1D__GtzD39j5KZLudoe0Y0
     #代办事项提醒
     template_schedule_remind: z32DERzD6X4ShOl86sI3YCOWl-lkr5Z9sKh1w_YG8Bs
   ##处方待处理提醒
   template_prescription_pending: aPl14500g7SblWWGBsisRgFGqtSskiGxmhGMD5tS9ik
   ##服务状态提醒
   template_consult_notice: 5eOa_Wx60tqsbuQK7ITTgRXB-8SntBONvopai_HFnhY
   #居民体征异常提醒
   template_abnormal_signs: 5i4OuDef0Bzk3SBD9iuhOGqoCH0OSaH3HYIC8Sgg-yA
   #咨询请求通知
   template_consult_request: TeiAPgxC7JTVfWa24fkemlJ8Nvji_NCPYmxKzXql05A
   #签约申请通知
   template_sign_request: 7zB0Qf4nUEZlkGnoElmx8I4Q5dm0Gq9JZP6PCzl9b7s
   #随访提醒
   template_followup_success: -9blCMt1b7t24biL7QbkmQH0KWLgOIDQ5LtyX_Ai49E
   #处理结果通知
   template_treatment_result: J3W3-ZGZ5miHd0Ka1JLaXCYkIoCdiuJ-c527PH5nPQI
   #咨询回复提醒
   template_consult_reply: x7fIXWcd1YsXAnwhP-gmW1D__GtzD39j5KZLudoe0Y0
   #代办事项提醒
   template_schedule_remind: z32DERzD6X4ShOl86sI3YCOWl-lkr5Z9sKh1w_YG8Bs
yihu:
  yihu_OpenPlatform_url: http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/

+ 11 - 9
patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/DiseaseConvert.java

@ -29,19 +29,21 @@ public class DiseaseConvert implements Convert {
        List<String> keyList = null;
        for(DataModel one:oneList){
            try {
                keyList = initHealthLabesMap(jdbcTemplate, temp, one);
                for(String key:keyList){
                if("63".equals(temp.getQuotaCode())){
                    DataModel dataModelTemp = new DataModel();
                    BeanUtils.copyProperties(one, dataModelTemp);
                    if("63".equals(temp.getQuotaCode())){
                    DataModel.class.getMethod("setSlaveKey" + slaveLevel, String.class).invoke(dataModelTemp, one.getHealthProblem());
                    returnList.add(dataModelTemp);
                }else{
                        if(tempMap.containsKey(String.valueOf(one.getPatient()))){
                            continue;
                        }
                        tempMap.put(String.valueOf(one.getPatient()),one);
                    keyList = initHealthLabesMap(jdbcTemplate, temp, one);
                    for(String key:keyList){
                        DataModel dataModelTemp = new DataModel();
                        BeanUtils.copyProperties(one, dataModelTemp);
                        DataModel.class.getMethod("setSlaveKey" + slaveLevel, String.class).invoke(dataModelTemp, key);
                        returnList.add(dataModelTemp);
                    }
                    DataModel.class.getMethod("setSlaveKey" + slaveLevel, String.class).invoke(dataModelTemp, key);
                    returnList.add(dataModelTemp);
                }
            }catch (Exception e) {

+ 9 - 1
patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/vo/DataModel.java

@ -23,7 +23,7 @@ public class DataModel {
    private String healthLable;//健康标签
    private Double num=1.0;//分数 如果是累加的计算 默认是1 如果是分数从数据库拿
    private String prescriptionCode;//处方code
    private String healthProblem;//诊断标签
    public String getHealthLable() {
        return healthLable;
@ -181,4 +181,12 @@ public class DataModel {
    public void setPrescriptionCode(String prescriptionCode) {
        this.prescriptionCode = prescriptionCode;
    }
    public String getHealthProblem() {
        return healthProblem;
    }
    public void setHealthProblem(String healthProblem) {
        this.healthProblem = healthProblem;
    }
}

+ 2 - 1
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@ -2657,9 +2657,10 @@ public class ConsultTeamService extends ConsultService {
        contentobj.put("doctorremind","已向居民发送问卷填写请求,填写完成后您将收到消息提醒");
        contentobj.put("patientremind","填写完成并提交后,医生将可以查看您的问卷内容");
        contentobj.put("msgType",type);
        contentobj.put("isSendWxTemplate",true);//是否发送咨询回复的微信模板
        //医生发送Im消息
        ImUtill.sendTopicIM(prescription.getDoctor(), prescription.getDoctorName(), prescription.getConsult(), "17", contentobj.toString(), null);
    
        contentobj.put("isSendWxTemplate",false);//是否发送咨询回复的微信模板
        //居民发送Im消息
        ImUtill.sendTopicIM(prescription.getPatient(), prescription.getPatientName(), prescription.getConsult(), "17", contentobj.toString(), null);
    }

+ 8 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionFollowupContentService.java

@ -363,6 +363,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				//医生发送的消息
				contentDoctor.put("text", "请提供您最近一次的血糖检测数值及检测时间");
				contentDoctor.put("needUpload","false");
				contentDoctor.put("isSendWxTemplate",false);//是否发送咨询回复的微信模板
				contentDoctor.put("type",2);
				
				//医生发送Im消息
@ -373,6 +374,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				contentPatient.put("tzMsg", "体征记录:血糖 "+imBloodSugarValue+"mmol/L");
				contentPatient.put("tzTime", "检测时间:"+DateUtil.dateToStr(imBloodSugarDate,"yyyy-MM-dd HH:mm:ss"));
				contentPatient.put("tzAlert","温馨提示:本条体征为居民上传的健康体征数据,您可以");
				contentPatient.put("isSendWxTemplate",false);//是否发送咨询回复的微信模板
				contentPatient.put("needUpload","false");
				contentPatient.put("type",2);
				
@ -385,6 +387,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				//医生发送的消息
				contentDoctor.put("text", "请提供您最近一次的血糖检测数值及检测时间");
				contentDoctor.put("needUpload","true");
				contentDoctor.put("isSendWxTemplate",true);//是否发送咨询回复的微信模板
				contentDoctor.put("type",2);
				//医生发送Im消息
				ImUtill.sendTopicIM(prescription.getDoctor(), prescription.getDoctorName(), prescription.getConsult(), "16", contentDoctor.toString(), null);
@ -395,6 +398,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				contentPatient.put("tzTime", "检测时间:");
				contentPatient.put("tzAlert","温馨提示:居民近30天未上传血糖体征数据,已通知居民上传数据,请耐心等待");
				contentPatient.put("needUpload","true");
				contentPatient.put("isSendWxTemplate",false);//是否发送咨询回复的微信模板
				contentPatient.put("type",2);
				
				//患者发送Im消息
@ -457,6 +461,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				//医生发送的消息
				contentDoctor.put("text", "请提供您最近一次的血压检测数值及检测时间");
				contentDoctor.put("needUpload","false");
				contentDoctor.put("isSendWxTemplate",false);//是否发送咨询回复的微信模板
				contentDoctor.put("type",1);
				
				//医生发送Im消息
@ -468,6 +473,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				contentPatient.put("tzTime", "检测时间:"+jsonObject.getString("date"));
				contentPatient.put("tzAlert","温馨提示:本条体征为居民上传的健康体征数据,您可以");
				contentPatient.put("needUpload","false");
				contentPatient.put("isSendWxTemplate",false);//是否发送咨询回复的微信模板
				contentPatient.put("type",1);
				
				//患者发送Im消息
@ -480,6 +486,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				//医生发送的消息
				contentDoctor.put("text", "请提供您最近一次的血压检测数值及检测时间");
				contentDoctor.put("needUpload","true");
				contentDoctor.put("isSendWxTemplate",true);//是否发送咨询回复的微信模板
				contentDoctor.put("type",1);
				//医生发送Im消息
				ImUtill.sendTopicIM(prescription.getDoctor(), prescription.getDoctorName(), prescription.getConsult(), "16", contentDoctor.toString(), null);
@ -490,6 +497,7 @@ public class PrescriptionFollowupContentService extends BaseService {
				contentPatient.put("tzTime", "检测时间:");
				contentPatient.put("tzAlert","温馨提示:居民近30天未上传血压体征数据,已通知居民上传数据,请耐心等待");
				contentPatient.put("needUpload","true");
				contentPatient.put("isSendWxTemplate",false);//是否发送咨询回复的微信模板
				contentPatient.put("type",1);
				
				//患者发送Im消息

+ 1 - 1
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionInfoService.java

@ -1626,7 +1626,7 @@ public class PrescriptionInfoService extends BaseService {
    }
    public JSONArray getIcd10Info(String nameKey) {
        StringBuffer stringBuffer = new StringBuffer(" SELECT t.code,t.name FROM icd10_dict t WHERE t.name LIKE ?");
        StringBuffer stringBuffer = new StringBuffer(" SELECT t.code,t.name FROM icd10_dict t WHERE t.name LIKE ? and t.chronic_flag='1' ");
        List<Map<String, Object>> rs = jdbcTemplate.queryForList(stringBuffer.toString(), new Object[]{"%" + nameKey + "%"});
        return new JSONArray(rs);
    }

+ 56 - 36
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java

@ -2966,7 +2966,7 @@ public class StatisticsESService {
    public List<Map<String, Object>> getPrescriptionAgeLowLevel(String level, String lowlevel, String area, String disease) throws Exception {
        String quotaDate = elasticsearchUtil.getQuotaTime();
        List<SaveModel> list = elasticsearchUtil.findListDateQuotaLevel1(quotaDate, area, Integer.parseInt(level), "58", "2", lowlevel, disease);
        List<SaveModel> list = elasticsearchUtil.findListDateQuotaLevel1(quotaDate, area, Integer.parseInt(level), "63", "2", lowlevel, disease);
        Map<String, Object> map = null;
        List<Map<String, Object>> rs = new ArrayList<>();
        if (list.size() > 0) {
@ -3062,18 +3062,28 @@ public class StatisticsESService {
        Long num = (Long) count.get("num");
        Map<String, Object> map = new HashMap<>();
        DecimalFormat decimalFormat = new DecimalFormat("0.00");//构造方法的字符格式这里如果小数不足2位,会以0补足.
        Double ageRate = list.get(0).getResult2() / num;
        map.put("0ageRate", decimalFormat.format(ageRate));
        ageRate = list.get(1).getResult2() / num;
        map.put("7ageRate", decimalFormat.format(ageRate));
        ageRate = list.get(2).getResult2() / num;
        map.put("19ageRate", decimalFormat.format(ageRate));
        ageRate = list.get(3).getResult2() / num;
        map.put("31ageRate", decimalFormat.format(ageRate));
        ageRate = list.get(4).getResult2() / num;
        map.put("51ageRate", decimalFormat.format(ageRate));
        ageRate = list.get(5).getResult2() / num;
        map.put("65ageRate", decimalFormat.format(ageRate));
        if(num==0){
            map.put("0ageRate", 0.0);
            map.put("7ageRate", 0.0);
            map.put("19ageRate", 0.0);
            map.put("31ageRate", 0.0);
            map.put("51ageRate", 0.0);
            map.put("65ageRate", 0.0);
        }else{
            Double ageRate = list.get(0).getResult2() / num;
            map.put("0ageRate", decimalFormat.format(ageRate));
            ageRate = list.get(1).getResult2() / num;
            map.put("7ageRate", decimalFormat.format(ageRate));
            ageRate = list.get(2).getResult2() / num;
            map.put("19ageRate", decimalFormat.format(ageRate));
            ageRate = list.get(3).getResult2() / num;
            map.put("31ageRate", decimalFormat.format(ageRate));
            ageRate = list.get(4).getResult2() / num;
            map.put("51ageRate", decimalFormat.format(ageRate));
            ageRate = list.get(5).getResult2() / num;
            map.put("65ageRate", decimalFormat.format(ageRate));
        }
        return map;
    }
@ -3288,13 +3298,14 @@ public class StatisticsESService {
     * @return
     */
    public Map<String, Object> getPrescriptionAgeTotal(String level, String area, String disease) throws Exception {
        //统计长处方总数疾病和状态维度(去重相同患者)
        String index ="63";
        String quotaDate = elasticsearchUtil.getQuotaTime();
        //统计年龄分布
        List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel2(quotaDate, area, Integer.parseInt(level), "60", "2", disease);
        List<SaveModel> list = elasticsearchUtil.findOneDateQuotaLevel2(quotaDate, area, Integer.parseInt(level), index, "2", disease);
        //总数量
        SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0(quotaDate, area, Integer.parseInt(level), "60", "2");
        SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel0(quotaDate, area, Integer.parseInt(level), index, "2");
        Double num = saveModel.getResult2();
        Map<String, Object> map = new HashMap<>();
@ -3324,44 +3335,46 @@ public class StatisticsESService {
    }
    public Map<String, Object> getPrescriptionDispatchingTotal(int level, String area, String disease) throws Exception {
        List<SaveModel> seltList = null;//自取集合
        List<SaveModel> deliveryList = null;//物流配送集合
        List<SaveModel> healthDoctorList = null;//健管师配送集合
        String index = "62";
        SaveModel selt = null;//自取集合
        SaveModel delivery = null;//物流配送集合
        SaveModel healthDoctor = null;//健管师配送集合
        String quotaTime = elasticsearchUtil.getQuotaTime();
        //type二级指标,disease一级指标
        if (StringUtils.isNotBlank(disease)) {
            //自取
            seltList = elasticsearchUtil.findListDateQuotaLevel2(quotaTime, area, level, "62", "2", "", "1", disease);
            selt = elasticsearchUtil.findOneDateQuotaLevel2(quotaTime,area, level, index, "2", disease, "1");
            //物流配送
            deliveryList = elasticsearchUtil.findListDateQuotaLevel2(quotaTime, area, level, "62", "2", "", "2", disease);
            delivery = elasticsearchUtil.findOneDateQuotaLevel2(quotaTime,area, level, index, "2", disease, "2");
            //健管师配送
            healthDoctorList = elasticsearchUtil.findListDateQuotaLevel2(quotaTime, area, level, "62", "2", "", "2", disease);
            healthDoctor = elasticsearchUtil.findOneDateQuotaLevel2(quotaTime,area, level, index, "2", disease, "3");
        } else {
            //自取
            seltList = elasticsearchUtil.findListDateQuotaLevel1(quotaTime, area, level, "62", "2", "", "1");
            selt = elasticsearchUtil.findOneDateQuotaLevel1Key2(quotaTime, area, level, index, "2", "1");
            //物流配送
            deliveryList = elasticsearchUtil.findListDateQuotaLevel1(quotaTime, area, level, "62", "2", "", "2");
            delivery = elasticsearchUtil.findOneDateQuotaLevel1Key2(quotaTime, area, level, index, "2", "2");
            //健管师配送
            healthDoctorList = elasticsearchUtil.findListDateQuotaLevel1(quotaTime, area, level, "62", "2", "", "2");
            healthDoctor = elasticsearchUtil.findOneDateQuotaLevel1Key2(quotaTime, area, level, index, "2", "3");
        }
        Map<String, Object> rs = new HashedMap();
        //自取数目
        if (seltList != null && seltList.size() > 0) {
            rs.put("seltTotal", seltList.get(0).getResult2());
        if (selt != null) {
            rs.put("seltTotal", selt.getResult2());
        } else {
            rs.put("seltTotal", 0);
        }
        //快递配送
        if (deliveryList != null && deliveryList.size() > 0) {
            rs.put("deliveryTotal", deliveryList.get(0).getResult2());
        if (delivery != null) {
            rs.put("deliveryTotal", delivery.getResult2());
        } else {
            rs.put("deliveryTotal", 0);
        }
        //健管师配送
        if (healthDoctorList != null && healthDoctorList.size() > 0) {
            rs.put("doctorTotal", healthDoctorList.get(0).getResult2());
        if (healthDoctor != null) {
            rs.put("doctorTotal", healthDoctor.getResult2());
        } else {
            rs.put("doctorTotal", 0);
        }
@ -3397,9 +3410,9 @@ public class StatisticsESService {
        List<SaveModel> resultList = new ArrayList<>();
        if (StringUtils.isNotBlank(disease)) {
            resultList = elasticsearchUtil.findLineChartDateQuotaLevel2(startTime, endTime, area, level, "62", "2", "3", type, disease);
            resultList = elasticsearchUtil.findLineChartDateQuotaLevel2(startTime, endTime, area, level, "62", "2", "3",disease , type);
        } else {
            resultList = elasticsearchUtil.findLineChartDateQuotaLevel1(startTime, endTime, area, level, "62", "2", "3", type);
            resultList = elasticsearchUtil.findLineChartDateQuotaLevel1Key2(startTime, endTime, area, level, "62", "2", "3", type);
        }
        for (Map<String, Object> m : rs) {
@ -3434,9 +3447,9 @@ public class StatisticsESService {
        List<Map<String, Object>> rs = new ArrayList<>();
        if (StringUtils.isNotBlank(disease)) {
            //类型 1.自取,2.快递配送,3.健管师配送
            saveModels = elasticsearchUtil.findListDateQuotaLevel2(quotaDate, area, level, index, "2", lowlevel, type, disease);
            saveModels = elasticsearchUtil.findListDateQuotaLevel2(quotaDate, area, level, index, "2", lowlevel, disease, type);
        } else {
            saveModels = elasticsearchUtil.findListDateQuotaLevel1(quotaDate, area, level, index, "2", lowlevel, type);
            saveModels = elasticsearchUtil.findListDateQuotaLevel1Key2(quotaDate, area, level, index, "2", lowlevel, type);
        }
        if ("5".equals(lowlevel)) {
            translateTeamLeaderName2(saveModels);
@ -3604,7 +3617,14 @@ public class StatisticsESService {
            }
            map = new HashMap<>();
            map.put("avg", avg);
            map.put("date", dateFormat.format(one.getQuotaDate()));
            if("1".equals(type)){
                map.put("date", dateFormat.format(one.getQuotaDate()));
            }else if("2".equals(type)){
                map.put("date", DateUtil.getWeekOfMonth(dateFormat.format(one.getQuotaDate())));
            }else{
                map.put("date", DateUtil.getMonth(dateFormat.format(one.getQuotaDate())));
            }
            countList.add(map);
        }
        return countList;

+ 7 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/DateUtil.java

@ -1107,4 +1107,11 @@ public class DateUtil {
		calendar.setTime(date);
		return calendar.get(Calendar.YEAR)+"";
	}
	public static String getMonth(String dateString){
		Date date = strToDate(dateString);
		return new SimpleDateFormat(YYYY_MM).format(date);
	}
}

+ 2 - 0
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/service/GcEduArticleService.java

@ -1,5 +1,6 @@
package com.yihu.wlyy.web.third.gateway.service;
//import com.yihu.es.entity.ArticleTest;
import com.yihu.wlyy.config.es.ElastricSearchSave;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.patient.Patient;
@ -18,6 +19,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import java.util.*;
/**