代码修改

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

@@ -701,20 +701,6 @@ public class ConsultTeamService extends ConsultService {
            ct.setTeam(sc.getTeamCode());
            // 设置健康管理师，三师咨询默认给健康管理师处理
            //查找病人所在的团队
            //1.3.3.2 更改从签约记录判断团队成员
//            if(StringUtils.isNotBlank(sf.getDoctorHealth())) {
//                users.put(sf.getDoctorHealth(), 0);
//                ct.setDoctor(sf.getDoctorHealth());
//                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);
//                }
//            }
            DoctorTeam doctorTeam = doctorTeamDao.findBySanshiParientCode(patient);
            //得到团队的健康管理师
            DoctorTeamMember doctorTeamMemberHealthy = doctorTeamDoctor.findDoctorSanshi2ByTeam(doctorTeam.getCode(), 3);
@@ -745,23 +731,38 @@ public class ConsultTeamService extends ConsultService {
            ct.setTeam(sf.getTeamCode());
            // 设置健康管理师，家庭医生咨询默认给健康管理师处理
            //查找病人所在的团队
            DoctorTeam doctorTeam = doctorTeamDao.findByParientCode(patient);
            //得到团队的健康管理师
            DoctorTeamMember doctorTeamMemberHealthy = doctorTeamDoctor.findDoctorJiating2ByTeam(doctorTeam.getCode(), 3);
            DoctorTeamMember doctorTeamMember = doctorTeamDoctor.findDoctorJiating2ByTeam(doctorTeam.getCode(), 2);
            if (doctorTeamMemberHealthy == null) {
                ct.setDoctor(doctorTeamMember.getMemberCode());
                users.put(doctorTeamMember.getMemberCode(), 0);
            } else {
                users.put(doctorTeamMemberHealthy.getMemberCode(), 0);
                if (doctorTeamMember != null) {
                    //全健同一个人导致会话成员状态问题处理
                    if (users.isNull(doctorTeamMember.getMemberCode())) {
                        users.put(doctorTeamMember.getMemberCode(), 1);
                    }
            //1.3.3.2 更改从签约记录判断团队成员,分配建管师
            if(StringUtils.isNotBlank(sf.getDoctorHealth())) {
                users.put(sf.getDoctorHealth(), 0);
                ct.setDoctor(sf.getDoctorHealth());
                if (StringUtils.isNotBlank(sf.getDoctor())) {
                    if (users.isNull(sf.getDoctor())) {
                        users.put(sf.getDoctor(), 1);
                   }
                }
                ct.setDoctor(doctorTeamMemberHealthy.getMemberCode());
            } else {
                ct.setDoctor(sf.getDoctor());
                users.put(sf.getDoctor(), 0);
            }
//            DoctorTeam doctorTeam = doctorTeamDao.findByParientCode(patient);
//            //得到团队的健康管理师
//            DoctorTeamMember doctorTeamMemberHealthy = doctorTeamDoctor.findDoctorJiating2ByTeam(doctorTeam.getCode(), 3);
//            DoctorTeamMember doctorTeamMember = doctorTeamDoctor.findDoctorJiating2ByTeam(doctorTeam.getCode(), 2);
//            if (doctorTeamMemberHealthy == null) {
//                ct.setDoctor(doctorTeamMember.getMemberCode());
//                users.put(doctorTeamMember.getMemberCode(), 0);
//            } else {
//                users.put(doctorTeamMemberHealthy.getMemberCode(), 0);
//                if (doctorTeamMember != null) {
//                    //全健同一个人导致会话成员状态问题处理
//                    if (users.isNull(doctorTeamMember.getMemberCode())) {
//                        users.put(doctorTeamMember.getMemberCode(), 1);
//                    }
//                }
//                ct.setDoctor(doctorTeamMemberHealthy.getMemberCode());
//            }
            // 设置家庭医生
            ct.setAdminTeamId(sf.getAdminTeamId());
        }
@@ -1951,7 +1952,6 @@ public class ConsultTeamService extends ConsultService {
        super.sendMucMessageBySingnType(doctor, doctorName, patient, content, contentType, title);
    }
    public void removeRenewPerson(JSONObject jsonObject,String uid){
        JSONArray j = jsonObject.getJSONArray("users");
        List<Integer> indexs =new ArrayList<>();

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

@@ -11,6 +11,7 @@ import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.statistics.PopulationBaseDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.app.team.AdminTeamService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.MapListUtils;
import org.json.JSONArray;
@@ -286,7 +287,7 @@ public class StatisticsService extends BaseService {
            sql+=" and level2_type = '"+level2_type+"'";
        }
        sql+=   " group by " + lowLevelField + "," + lowLevelName;
        sql+=   " group by " + lowLevelField ;//+ "," + lowLevelName;更具名称group by会有问题
        if (sort == 1) {
            sql += " order by amount desc";
@@ -497,7 +498,8 @@ public class StatisticsService extends BaseService {
                "   and quota_date >= ? " +
                "   and quota_date <= ? " +
                "   and " + areaField + " = ? " +
                " group by " + lowLevelField + "," + lowLevelName;
                " group by " + lowLevelField ;
                //+ "," + lowLevelName; 加上名称group by会影响下面流程 团队如果改名字 数据会被覆盖
        if (sort == 1) {
            sql += " order by amount desc";
@@ -1849,17 +1851,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+
@@ -2196,4 +2198,12 @@ public class StatisticsService extends BaseService {
        JSONArray js = new JSONArray(rs);
        return js;
    }
    public int checkDoctorIsTeamleader(String doctor){
        AdminTeam team = adminTeamDao.findByLeaderCode(doctor);
        if(team!=null){
            return 1;
        }
        return 0;
    }
}

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

@@ -269,10 +269,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";
@@ -281,7 +282,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);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -579,20 +579,38 @@ public class PatientController extends WeixinBaseController {
            //查询家庭签约
            SignFamily jt = familyContractService.findByPatientYes(id);
            if (jt != null) {
                List<Object> doctors = doctorTeamService.findJiatingTeamDoctorsObj(id);
                if (doctors != null) {
                    for (Object doctor : doctors) {
                        if (doctor == null) {
                            continue;
                        }
                        Object[] docArray = (Object[]) doctor;
                        JSONObject doctorJson = new JSONObject();
                        doctorJson.put("code", docArray[0]);
                        doctorJson.put("name", docArray[1]);
                        doctorJson.put("level", docArray[2]);
                        doctorJson.put("teamlevel", docArray[3]);
//                List<Object> doctors = doctorTeamService.findJiatingTeamDoctorsObj(id);
//                if (doctors != null) {
//                    for (Object doctor : doctors) {
//                        if (doctor == null) {
//                            continue;
//                        }
//                        Object[] docArray = (Object[]) doctor;
//                        JSONObject doctorJson = new JSONObject();
//                        doctorJson.put("code", docArray[0]);
//                        doctorJson.put("name", docArray[1]);
//                        doctorJson.put("level", docArray[2]);
//                        doctorJson.put("teamlevel", docArray[3]);
//                        familyDoctors.add(doctorJson);
//                    }
//                }
                //设置全科医生
                if(StringUtils.isNotBlank(jt.getDoctor())){
                    JSONObject doctorJson = new JSONObject();
                        doctorJson.put("code",jt.getDoctor());
                        doctorJson.put("name", jt.getDoctorName());
                        doctorJson.put("level", 2);
                        doctorJson.put("teamlevel", 2);
                        familyDoctors.add(doctorJson);
                    }
                }
                //设置建管师
                if(StringUtils.isNotBlank(jt.getDoctorHealth())){
                    JSONObject doctorJson = new JSONObject();
                    doctorJson.put("code",jt.getDoctorHealth());
                    doctorJson.put("name", jt.getDoctorHealthName());
                    doctorJson.put("level", 3);
                    doctorJson.put("teamlevel", 3);
                    familyDoctors.add(doctorJson);
                }
            }
            // 查询三师医生

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/StatisticsController.java

@@ -825,5 +825,20 @@ public class StatisticsController extends BaseController {
        }
    }
    /**
     * 判断团队是否是团队长
     * @return
     */
    @RequestMapping("/checkDoctorIsTeamLeder")
    @ResponseBody
    public String checkDoctorIsTeamLeder(){
        try {
            return write(200, "查询成功", "data", statisticsService.checkDoctorIsTeamleader(getUID()));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");
        }
    }
}