代码修改

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1369,7 +1369,7 @@ public class ImService {
                    sessionId = patient + "_" + outpatientCode + "_" + ct.getType();
                    obj = imUtil.createTopics(sessionId, consult.getId(), p.getName(), users, messages, imUtil.SESSION_TYPE_COLLABORATION_HOSPITAL);
                } else if ("3".equals(wlyyOutpatientDO.getOutpatientType())) {
                } else if ("3".equals(wlyyOutpatientDO.getOutpatientType())||"5".equals(wlyyOutpatientDO.getOutpatientType())) {
                    messages = imUtil.getCreateTopicMessage(patient, p.getName(), consult.getTitle(), content, consult.getImages(), doctorCode);
                    //5、（im创建咨询） 续方咨询的sessionid为居民code+就诊code+9(图文,视频,图文+视频)
                    sessionId = patient + "_" + outpatientCode + "_" + ct.getType();
@@ -4313,7 +4313,7 @@ public class ImService {
            } else if (type.equalsIgnoreCase("16")) {
                sql += " AND op.type =2 and op.outpatient_type = 1";
            } else if (type.equalsIgnoreCase("1")) {
                sql += " AND op.type =1 and op.outpatient_type = 3";
                sql += " AND op.type =1 and (op.outpatient_type = 3 or op.outpatient_type=5) ";
            } else if (type.equalsIgnoreCase("15")) {
                sql += " AND op.type =3 and op.outpatient_type = 3";
            } else if (type.equalsIgnoreCase("17")) {
@@ -4363,6 +4363,9 @@ public class ImService {
                if ("3".equalsIgnoreCase(map.get("outpatientType").toString()) && "1".equalsIgnoreCase(map.get("type").toString())) {
                    map.put("type", 1);
                }
                if ("5".equalsIgnoreCase(map.get("outpatientType").toString()) && "1".equalsIgnoreCase(map.get("type").toString())) {
                    map.put("type", 1);
                }
                if ("3".equalsIgnoreCase(map.get("outpatientType").toString()) && "2".equalsIgnoreCase(map.get("type").toString())) {
                    map.put("type", 17);
                }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/DoctorConsultEndpoint.java

@@ -295,8 +295,7 @@ public class DoctorConsultEndpoint extends EnvelopRestEndpoint {
							rsCode="0";
							mes="已挂号";
						}else {
							if (!outpatientDO.getOutpatientType().equalsIgnoreCase("2")&&!outpatientDO.getOutpatientType().equalsIgnoreCase("3")
									&&!outpatientDO.getOutpatientType().equalsIgnoreCase("4")){
							if (outpatientDO.getOutpatientType().equalsIgnoreCase("1")){
								JSONObject res = dsyyPrescriptionService.registerOutPatient(outpatientCode,doctorCode);
								rsCode = res.getString("@RESULT");
								mes = res.getString("@MSG");