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

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

@@ -289,12 +289,10 @@ public class SignPatientLabelInfoService extends BaseService {
                        jsonP.put("expensesType", sign.get("expenses_type") != null ? String.valueOf(sign.get("expenses_type")) : "");
                        if (StringUtils.isEmpty(String.valueOf(jsonP.get("expensesStatus"))) || String.valueOf(jsonP.get("expensesStatus")).equals("0")) {
                            String epTime = "";
                            if(redisTemplate.isExposeConnection()) {
                                try {
                                    epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                                } catch (Exception e) {
                                    e.printStackTrace();
                                }
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                            if (StringUtils.isEmpty(epTime)) {
                                jsonP.put("expensesRemindStatus", 0);
@@ -346,12 +344,10 @@ public class SignPatientLabelInfoService extends BaseService {
                    if (StringUtils.isEmpty(String.valueOf(json.get("expensesStatus"))) || String.valueOf(json.get("expensesStatus")).equals("0")) {
                        String epTime = "";
                        if(redisTemplate.isExposeConnection()) {
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                        try {
                            epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                        if (StringUtils.isEmpty(epTime)) {
                            json.put("expensesRemindStatus", 0);
@@ -425,12 +421,10 @@ public class SignPatientLabelInfoService extends BaseService {
                        jsonP.put("expensesType", sign.get("expenses_type") != null ? String.valueOf(sign.get("expenses_type")) : "");
                        if (StringUtils.isEmpty(String.valueOf(jsonP.get("expensesStatus"))) || String.valueOf(jsonP.get("expensesStatus")).equals("0")) {
                            String epTime = "";
                            if(redisTemplate.isExposeConnection()) {
                                try {
                                    epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                                } catch (Exception e) {
                                    e.printStackTrace();
                                }
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                            if (StringUtils.isEmpty(epTime)) {
                                jsonP.put("expensesRemindStatus", 0);
@@ -495,12 +489,10 @@ public class SignPatientLabelInfoService extends BaseService {
                    if (StringUtils.isEmpty(String.valueOf(json.get("expensesStatus"))) || String.valueOf(json.get("expensesStatus")).equals("0")) {
                        String epTime = "";
                        if(redisTemplate.isExposeConnection()) {
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                        try {
                            epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                        if (StringUtils.isEmpty(epTime)) {
                            json.put("expensesRemindStatus", 0);
@@ -1191,12 +1183,10 @@ public class SignPatientLabelInfoService extends BaseService {
                        jsonP.put("expensesType", sign.get("expenses_type") != null ? String.valueOf(sign.get("expenses_type")) : "");
                        if (StringUtils.isEmpty(String.valueOf(jsonP.get("expensesStatus"))) || String.valueOf(jsonP.get("expensesStatus")).equals("0")) {
                            String epTime = "";
                            if(redisTemplate.isExposeConnection()) {
                                try {
                                    epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                                } catch (Exception e) {
                                    e.printStackTrace();
                                }
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                            if (StringUtils.isEmpty(epTime)) {
                                jsonP.put("expensesRemindStatus", 0);
@@ -1271,12 +1261,10 @@ public class SignPatientLabelInfoService extends BaseService {
//                }
                    if (StringUtils.isEmpty(String.valueOf(json.get("expensesStatus"))) || String.valueOf(json.get("expensesStatus")).equals("0")) {
                        String epTime = "";
                        if(redisTemplate.isExposeConnection()) {
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                        try {
                            epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                        if (StringUtils.isEmpty(epTime)) {
                            json.put("expensesRemindStatus", 0);
@@ -1606,12 +1594,10 @@ public class SignPatientLabelInfoService extends BaseService {
                        jsonP.put("expensesType", sign.get("expenses_type") != null ? String.valueOf(sign.get("expenses_type")) : "");
                        if (StringUtils.isEmpty(String.valueOf(jsonP.get("expensesStatus"))) || String.valueOf(jsonP.get("expensesStatus")).equals("0")) {
                            String epTime = "";
                            if(redisTemplate.isExposeConnection()) {
                                try {
                                    epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                                } catch (Exception e) {
                                    e.printStackTrace();
                                }
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                            if (StringUtils.isEmpty(epTime)) {
                                jsonP.put("expensesRemindStatus", 0);
@@ -1683,12 +1669,10 @@ public class SignPatientLabelInfoService extends BaseService {
                    if (StringUtils.isEmpty(String.valueOf(json.get("expensesStatus"))) || String.valueOf(json.get("expensesStatus")).equals("0")) {
                        String epTime = "";
                        if(redisTemplate.isExposeConnection()) {
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                        try {
                            epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                        if (StringUtils.isEmpty(epTime)) {
                            json.put("expensesRemindStatus", 0);
@@ -1758,12 +1742,10 @@ public class SignPatientLabelInfoService extends BaseService {
                        jsonP.put("expensesType", sign.get("expenses_type") != null ? String.valueOf(sign.get("expenses_type")) : "");
                        if (StringUtils.isEmpty(String.valueOf(jsonP.get("expensesStatus"))) || String.valueOf(jsonP.get("expensesStatus")).equals("0")) {
                            String epTime = "";
                            if(redisTemplate.isExposeConnection()) {
                                try {
                                    epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                                } catch (Exception e) {
                                    e.printStackTrace();
                                }
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                            if (StringUtils.isEmpty(epTime)) {
@@ -1822,12 +1804,10 @@ public class SignPatientLabelInfoService extends BaseService {
                    if (StringUtils.isEmpty(String.valueOf(json.get("expensesStatus"))) || String.valueOf(json.get("expensesStatus")).equals("0")) {
                        String epTime = "";
                        if(redisTemplate.isExposeConnection()) {
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                        try {
                            epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                        if (StringUtils.isEmpty(epTime)) {
                            json.put("expensesRemindStatus", 0);
@@ -1958,12 +1938,10 @@ public class SignPatientLabelInfoService extends BaseService {
                        jsonP.put("expensesType", sign.get("expenses_type") != null ? String.valueOf(sign.get("expenses_type")) : "");
                        if (StringUtils.isEmpty(String.valueOf(jsonP.get("expensesStatus"))) || String.valueOf(jsonP.get("expensesStatus")).equals("0")) {
                            String epTime = "";
                            if(redisTemplate.isExposeConnection()) {
                                try {
                                    epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                                } catch (Exception e) {
                                    e.printStackTrace();
                                }
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                            if (StringUtils.isEmpty(epTime)) {
@@ -2016,12 +1994,10 @@ public class SignPatientLabelInfoService extends BaseService {
                    if (StringUtils.isEmpty(String.valueOf(json.get("expensesStatus"))) || String.valueOf(json.get("expensesStatus")).equals("0")) {
                        String epTime = "";
                        if(redisTemplate.isExposeConnection()) {
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                        try {
                            epTime = redisTemplate.opsForValue().get("expenses:remind:" + p.getCode());
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                        if (StringUtils.isEmpty(epTime)) {
                            json.put("expensesRemindStatus", 0);

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

@@ -741,10 +741,10 @@ public class DoctorConsultController extends WeixinBaseController {
                json.put("time", DateUtil.dateToStr(log.getCzrq(), DateUtil.YYYY_MM_DD_HH_MM_SS));
                ja.put(json);
            }
            return success("转接成功");
            return write(200,"查询成功","data",ja);
        } catch (Exception e) {
            error(e);
            return error(-1, "转接失败！");
            return error(-1, "查询失败！");
        }
    }
}

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

@@ -108,6 +108,17 @@ public class DoctorDiscussionGroupController extends BaseController {
                talkGroup.setHospitalCode(doctor.getHospital());
                talkGroup.setHospitalName(doctor.getHospitalName());
                if (StringUtils.isNotEmpty(consult)) {
                    if (type == 1) {
                        JSONObject consultTalkQk = talkGroupService.findConsultTalkGroup(consult);
                        if (consultTalkQk != null) {
                            return error(-1, "该咨询已求助过全科医生");
                        }
                    } else if (type == 2) {
                        JSONObject consultTalkQz = talkGroupService.getConsultGroup(consult);
                        if (consultTalkQz != null) {
                            return error(-1, "该咨询已有求助讨论组");
                        }
                    }
                    talkGroup.setConsultCode(consult);
                }
                talkGroup.setPatient(patient);
@@ -250,6 +261,17 @@ public class DoctorDiscussionGroupController extends BaseController {
                talkGroup.setHospitalCode(doctor.getHospital());
                talkGroup.setHospitalName(doctor.getHospitalName());
                if (StringUtils.isNotEmpty(consult)) {
                    if (type == 1) {
                        JSONObject consultTalkQk = talkGroupService.findConsultTalkGroup(consult);
                        if (consultTalkQk != null) {
                            return error(-1, "该咨询已求助过全科医生");
                        }
                    } else if (type == 2) {
                        JSONObject consultTalkQz = talkGroupService.getConsultGroup(consult);
                        if (consultTalkQz != null) {
                            return error(-1, "该咨询已有求助讨论组");
                        }
                    }
                    talkGroup.setConsultCode(consult);
                }
                talkGroup.setPatient(patient);
@@ -301,7 +323,7 @@ public class DoctorDiscussionGroupController extends BaseController {
                        talkMembers.add(doctorTalkMember);
                        if(type == 1 && object.getInt("doctorType") == 2){
                        if (type == 1 && object.getInt("doctorType") == 2) {
                            if (type == 1) {
                                consultTeamService.transfer(getUID(), object.getString("doctor"), consult);
                            }

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/sign/DoctorSignController.java

@@ -257,12 +257,10 @@ public class DoctorSignController extends BaseController {
                    json.put("sex", temp.get("sex"));
                    if (status == 5) {
                        String epTime = "";
                        if(redisTemplate.isExposeConnection()) {
                            try {
                                epTime = redisTemplate.opsForValue().get("expenses:remind:" + temp.get("patient"));
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
                        try {
                            epTime = redisTemplate.opsForValue().get("expenses:remind:" + temp.get("patient"));
                        } catch (Exception e) {
                            e.printStackTrace();
                        }
                        if (StringUtils.isEmpty(epTime)) {
                            json.put("expensesRemindStatus", 0);