Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -916,6 +916,11 @@ public class DoctorInfoService extends BaseService {
        if (StringUtils.isEmpty(signFamily.getTeamCode())) {
            return -1;
        }
        if(StringUtils.isNotEmpty(signFamily.getDoctorHealth())){
            return -2;
        }
        Doctor newD = doctorDao.findByCode(newDoctorCode);
        //修改签约中的健康管理师
        signFamily.setDoctorHealth(newD.getCode());

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

@@ -1833,7 +1833,7 @@ public class FamilyContractService extends BaseService {
                " JOIN wlyy_patient p ON sf.patient = p.CODE " +
                " WHERE " +
                " sf.type = 2 " +
                " AND sf. STATUS >= 0 " +
                " AND sf. STATUS > 0 " +
                // " and sf.doctor = ? " +
                " and sf.admin_team_code = ? " +
                " AND ( sf.doctor_health is null or sf.doctor_health ='' ) ) a where 1=1";
@@ -1870,7 +1870,7 @@ public class FamilyContractService extends BaseService {
                " JOIN wlyy_patient p ON sf.patient = p.CODE " +
                " WHERE " +
                " sf.type = 2 " +
                " AND sf. STATUS >= 0 " +
                " AND sf. STATUS > 0 " +
                //" and sf.doctor = ? " +
                " and sf.admin_team_code = ? " +
                " AND ( sf.doctor_health is null or sf.doctor_health ='' ) ) a where 1=1";
@@ -1916,7 +1916,7 @@ public class FamilyContractService extends BaseService {
                " left JOIN wlyy_sign_patient_label_info sp ON sf.patient = sp.patient AND sp.label_type = ? AND sp.`status` = 1 " +
                " WHERE " +
                " sf.type = 2 " +
                " AND sf. STATUS >= 0 " +
                " AND sf. STATUS > 0 " +
               // " and sf.doctor = ? " +
                " and sf.admin_team_code = ? " +
                " AND ( sf.doctor_health is null or sf.doctor_health ='' ) ";
@@ -2218,7 +2218,7 @@ public class FamilyContractService extends BaseService {
                    " left JOIN wlyy_sign_patient_label_info sp ON sf.patient = sp.patient AND sp.label_type = ? AND sp.`status` = 1 " +
                    " WHERE " +
                    " sf.type = 2 " +
                    " AND sf. STATUS >= 0 " +
                    " AND sf. STATUS > 0 " +
                    " and sf.doctor_health = ? " +
                    " and sf.admin_team_code = ? ";
@@ -2242,7 +2242,7 @@ public class FamilyContractService extends BaseService {
                    " left JOIN wlyy_sign_patient_label_info sp ON sf.patient = sp.patient AND sp.label_type = ? AND sp.`status` = 1 " +
                    " WHERE " +
                    " sf.type = 2 " +
                    " AND sf. STATUS >= 0 " +
                    " AND sf. STATUS > 0 " +
                    " and  sf.doctor = ?  " +
                    " and sf.admin_team_code = ? ";
@@ -2289,7 +2289,7 @@ public class FamilyContractService extends BaseService {
                " wlyy_sign_family sf " +
                " WHERE " +
                " sf.type = 2 " +
                " AND sf.STATUS >= 0 " +
                " AND sf.STATUS > 0 " +
                " AND ( sf.doctor = ? or sf.doctor_health=? )" +
                " AND sf.admin_team_code =?";
        Object[] parms = new Object[]{doctorCode, doctorCode, teamCode};

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/talk/TalkGroupService.java

@@ -461,6 +461,7 @@ public class TalkGroupService extends BaseService {
     * @param doctorName
     * @return
     */
    @Deprecated
    public JSONArray getOneToOneIm(String doctor, String doctorName) throws UnsupportedEncodingException {
        JSONArray result = null;
        JSONArray resultArray = new JSONArray();

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorDiscussionGroupController.java

@@ -837,6 +837,7 @@ public class DoctorDiscussionGroupController extends BaseController {
     * @param doctorName
     * @return
     */
    @Deprecated
    @RequestMapping(value = "/one_to_one_im", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getOneToOneIm(@RequestParam(required = false) String doctorName

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

@@ -749,8 +749,8 @@ public class ConsultController extends WeixinBaseController {
                        json.put("content", obj.getString("content"));
                        // 设置咨询或回复时间
                        json.put("time", DateUtil.dateToStr(new Date(obj.getLong("timestamp")), DateUtil.YYYY_MM_DD_HH_MM_SS));
                        // 设置记录类型：1文字，2图片，3语音
                        json.put("msgType", obj.getInt("contentType") == 2 ? 2 : 1);
                        // 设置记录类型：1文字，2图片，3语音 4 文章
                        json.put("msgType", obj.getInt("contentType"));
                        // 设置类型：0患者问，1医生回复，2患者追问，3患者评价
                        if (!obj.getString("from").equals(getUID())) {
                            json.put("type", 1);
@@ -807,7 +807,7 @@ public class ConsultController extends WeixinBaseController {
                    // 设置咨询或回复时间
                    json.put("time", DateUtil.dateToStr(new Date(obj.getLong("timestamp")), DateUtil.YYYY_MM_DD_HH_MM_SS));
                    // 设置记录类型：1文字，2图片，3语音
                    json.put("msgType", obj.getInt("contentType") == 2 ? 2 : 1);
                    json.put("msgType", obj.getInt("contentType"));
                    // 设置类型：0患者问，1医生回复，2患者追问，3患者评价
                    if (!obj.getString("from").equals(getUID())) {
                        json.put("type", 1);
@@ -889,7 +889,7 @@ public class ConsultController extends WeixinBaseController {
            // 设置咨询或回复时间
            json.put("time", DateUtil.dateToStr(new Date(obj.getLong("timestamp")), DateUtil.YYYY_MM_DD_HH_MM_SS));
            // 设置记录类型：1文字，2图片，3语音
            json.put("msgType", obj.getInt("contentType") == 2 ? 2 : 1);
            json.put("msgType", obj.getInt("contentType"));
            // 设置类型：0患者问，1医生回复，2患者追问，3患者评价
            if (!obj.getString("from").equals(getUID())) {
                json.put("type", 1);

patient-co-wlyy/src/main/resources/system.properties

@@ -163,7 +163,7 @@ template_doctor_change=TNIDMjduVKgVL4-k71umYLpHROvFB8K6mmm8aZC_EH8
##健康教育
#template_healthy_article=a5-ZGf-IUUULsuRNoHWQiBMU6pSYhLgPPqV67SjdLRo
##医生变更
#template_doctor_change=TNIDMjduVKgVL4-k71umYLpHROvFB8K6mmm8aZC_EH8
#template_doctor_change=dtzSHImbPKfwcrjWlJEjAw3lGlvrLjsobSOE8g4adZA
#----------------测试环境(健康之路i厦门)----------------#