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

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

@@ -395,7 +395,7 @@ public class SignWebService extends BaseService {
                    "  (doctor = '"+doctor+"' or doctor_health = '"+doctor+"') " +
                    " AND STATUS > 0 " +
                    " AND type = 2 " +
                    " AND expenses_status = '0'  " +
                    " AND (expenses_status = '0' or expenses_status = '3')  " +
                    " ) AS waitPayCount, " +
                    "( " +
                    " SELECT " +

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -1223,16 +1223,10 @@ public class DoctorConsultController extends WeixinBaseController {
                                   @ApiParam(name = "sessionId", value = "会话id", defaultValue = "")
                                   @RequestParam(value = "sessionId", required = true) String sessionId,
                                   @ApiParam(name = "businessType", value = "businessType", defaultValue = "1")
                                   @RequestParam(value = "businessType", required = true) String businessType,
                                   @ApiParam(name = "specialdoctor", value = "专科医生CODE", defaultValue = "")
                                   @RequestParam(value = "specialdoctor", required = true) String specialdoctor,
                                   @ApiParam(name = "familydoctor", value = "家庭医生CODE", defaultValue = "")
                                   @RequestParam(value = "familydoctor", required = true) String familydoctor){
                                   @RequestParam(value = "businessType", required = true) String businessType){
        try {
            String doctorCode = getUID();
            Doctor doctor = doctorService.findDoctorByCode(doctorCode);
            //判断居民家庭医生专科是否有共管关系
            int count= consultTeamService.getSpecialDoctorFamilyDoctorPatientCount(patient,specialdoctor,familydoctor);
            Patient p = patientService.findByCode(patient);
            com.alibaba.fastjson.JSONObject content = new com.alibaba.fastjson.JSONObject();
@@ -1240,8 +1234,7 @@ public class DoctorConsultController extends WeixinBaseController {
            content.put("patient",patient);
            content.put("photo",p.getPhoto());
            content.put("age",IdCardUtil.getAgeForIdcard(p.getIdcard()));
            content.put("sex",IdCardUtil.getSexForIdcard_new(p.getIdcard()));
            content.put("count",count);//大于0的就有共管关系
            content.put("sex",IdCardUtil.getSexForIdcard(p.getIdcard()));
            SignFamily signFamily = signFamilyDao.findByPatient(patient);
            if(signFamily!=null){
                content.put("hospitalName",signFamily.getHospitalName());

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/wechat/process/WeiXinEventProcess.java

@@ -883,8 +883,8 @@ public class WeiXinEventProcess {
        Map<String, String> articleConsult = new HashMap<>();
        articleConsult.put("Url", url);
        articleConsult.put("Title", "您有一个开通专科服务的邀请，点击查看");
        articleConsult.put("Description", "家庭医生协助专科医生团队为您提供专项服务");
        articleConsult.put("Title", "您正在申请开通专科服务，点击查看");
        articleConsult.put("Description", "共同为您提供健康管理保障");
        articleConsult.put("PicUrl", imgWebapp.getSpecialist_sign_url());
        articles.add(articleConsult);