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

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

@@ -715,12 +715,11 @@ public class ConsultTeamService extends ConsultService {
                if (StringUtils.isNotBlank(sf.getDoctor())) {
                    if (users.isNull(sf.getDoctor())) {
                        users.put(sf.getDoctor(), 1);
//                    }
                    }
                } else {
                    ct.setDoctor(sf.getDoctor());
                    users.put(sf.getDoctor(), 0);
                   }
                }
            } else {
                ct.setDoctor(sf.getDoctor());
                users.put(sf.getDoctor(), 0);
            }
//            DoctorTeam doctorTeam = doctorTeamDao.findByParientCode(patient);

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -176,10 +176,10 @@ public class SignPatientLabelInfoService extends BaseService {
            json.put("jtHospitalName", familySign.getHospitalName());
            if(StringUtils.isNotBlank(familySign.getSpecialPopulation())){
                json.put("jtServerName", familySign.getSpecialPopulationName()==null?"":familySign.getSpecialPopulationName());
                json.put("jtServer", familySign.getSpecialPopulationName()==null?"":familySign.getSpecialPopulation());
                json.put("jtServer", familySign.getSpecialPopulation()==null?"":familySign.getServerType()+"-"+familySign.getSpecialPopulation());
            }else{
                json.put("jtServerName", familySign.getServerTypeName()==null?"":familySign.getServerTypeName());
                json.put("jtServer", familySign.getServerTypeName()==null?"":familySign.getServerType());
                json.put("jtServer", familySign.getServerType()==null?"":familySign.getServerType());
            }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -1060,7 +1060,7 @@ public class SignWebService extends BaseService {
                    if ("0".equals(state)) {
                        data.put("first", renew.getName() + "，您好！\n" +
                                "您的家庭医生续签申请已被拒绝");
                        data.put("remark", "您可在到期后选择其他医生进行签约。");
                        data.put("remark", "您可选择其他医生进行签约。");
                        PushMsgTask.getInstance().putWxMsg(access_token, 2, patient.getOpenid(), patient.getName(), data);
                    } else if ("1".equals(state)) {
                        data.put("first", renew.getName() + "，您好！\n" +
@@ -1078,7 +1078,7 @@ public class SignWebService extends BaseService {
                            data.put("first", weiXinOpenIdUtils.getTitleMes(patient, (int) j.get("relation"), member.getName()) + "\n" +
                                    patient.getName() + "，您好！\n" +
                                    "您的家庭医生续签申请已被拒绝");
                            data.put("remark", "您可在到期后选择其他医生进行签约。");
                            data.put("remark", "您可选择其他医生进行签约。");
                            PushMsgTask.getInstance().putWxMsg(access_token, 2, member.getOpenid(), member.getName(), data);
                        } else if ("1".equals(state)) {
                            data.put("first", weiXinOpenIdUtils.getTitleMes(patient, (int) j.get("relation"), member.getName()) + "\n" +

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -1850,17 +1850,17 @@ public class StatisticsService extends BaseService {
            sql = "SELECT left(f.apply_date,10) as applyDate,count(1) as signCount " +
                    " FROM wlyy_sign_family_renew f " +
                    " where f.apply_date >='"+startDate+" 00:00:00' " +
                    " AND f.apply_date<='"+endDate+" 00:00:00' " +
                    " AND f.apply_date<='"+endDate+" 23:59:59' " +
                    " AND f.status >0 " +
                    " AND f.expenses_status='1' " +
                    " AND f.admin_team_code="+id+
                    " GROUP BY left(f.apply_date,10)";
            //按月
        }else{
            sql ="SELECT (DATE_FORMAT(f.apply_date,'%v')-DATE_FORMAT('2017-06-01','%v')+1) as weekOfMonth,count(1) as signCount " +
            sql ="SELECT (DATE_FORMAT(f.apply_date,'%v')-DATE_FORMAT('"+DateUtil.getFristDayOfMonth()+"','%v')+1) as weekOfMonth,count(1) as signCount " +
                    " FROM wlyy_sign_family_renew f " +
                    " where f.apply_date >='"+startDate+" 00:00:00' " +
                    " AND f.apply_date<='"+endDate+" 00:00:00' " +
                    " AND f.apply_date<='"+endDate+" 23:59:59' " +
                    " AND f.status >0 " +
                    " AND f.expenses_status='1' " +
                    " AND f.admin_team_code="+id+

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

@@ -270,10 +270,11 @@ public class PushMsgTask {
                keyword3.setValue(json.getString("doctorName"));
                m.put("keyword3", keyword3);
            } else if (type == 1 || type == 2) {
                if (type == 1)
                if (type == 1) {
                    temp_id = SystemConf.getInstance().getSystemProperties().getProperty("template_sign_success");
                else
                } else {
                    temp_id = SystemConf.getInstance().getSystemProperties().getProperty("template_sign_failed");
                }
                String isRenew = "0";
                if(json.has("isRenew")){
                    isRenew = "1";
@@ -282,7 +283,11 @@ public class PushMsgTask {
                if(json.has("signState")){
                    signState = (String)json.get("signState");
                }
                temp.setUrl(url + "ssgg/html/doctor-homepage-new.html?openid=" + openid + "&state=" + json.getString("doctor") + "&toUser=" + json.getString("toUser") + "&toName=" + name+"&isRenew="+isRenew+"&signState="+signState);
                if(json.has("isRenew")&&type==2){
                    //如果续签失败,不发送详情
                }else{
                    temp.setUrl(url + "ssgg/html/doctor-homepage-new.html?openid=" + openid + "&state=" + json.getString("doctor") + "&toUser=" + json.getString("toUser") + "&toName=" + name+"&isRenew="+isRenew+"&signState="+signState);
                }
                temp.setTouser(openid);
                temp.setTopcolor("#000000");
                temp.setTemplate_id(temp_id);