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

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

@@ -136,7 +136,7 @@ public class PushMsgTask {
			org.json.JSONObject participants = new org.json.JSONObject();
			participants.put("system",0);
			participants.put(receiver,0);
			org.json.JSONObject sessionObj  = ImUtill.createSession(url,participants,"2","系统消息","");
			org.json.JSONObject sessionObj  = ImUtill.createSession(url,participants,"0","系统消息","");
			if(sessionObj.getInt("status")==-1){
				throw  new RuntimeException(sessionObj.getString("message"));
			}

patient-co-wlyy/doc/部署文档/正式库/app/ios/00.readme.txt

@@ -0,0 +1,10 @@
----------------------------------
包名：
com.yihu.xmijk
证书密码：
111111
----------------------------------
develope.apple.com 账号：
chunyudang.yihu@gmail.com 
Jkzldangchunyu060201

patient-co-wlyy/doc/部署文档/正式库/app/安卓/00.readme.txt

@@ -0,0 +1,10 @@
----------------------------------
包名：
com.wjw.ssgg.doctor
证书别名：
ssgg_doctor.keystore
证书密码：
ssgg_doctor
----------------------------------

patient-co-wlyy/doc/部署文档/正式库/app/安卓/文档.txt

@@ -0,0 +1,5 @@
upload_preview.js
common_http.js
im_new.js

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/patient/PatientDeviceDao.java

@@ -22,4 +22,6 @@ public interface PatientDeviceDao extends PagingAndSortingRepository<PatientDevi
	PatientDevice findByDeviceSnAndCategoryCodeAndUserType(String deviceSn, String categoryCode,String userType);
	PatientDevice findByDeviceIdAndDeviceSnAndUserType(Long deviceId, String deviceSn,String userType);
	PatientDevice findByDeviceSnAndUserType(String deviceSn,String userType);
}

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

@@ -743,8 +743,8 @@ public class ConsultTeamService extends ConsultService {
        String content = addLogs(ct);
        //推送给IM去创建议题，取得成员消息
        JSONObject messages = ImUtill.getCreateTopicMessage(patient, tempPatient.getName(), consult.getTitle(), "咨询问题："+consult.getSymptoms(), consult.getImages());
        users.put(patient, 0);
        JSONObject obj = ImUtill.createTopics(patient + "_consult_" + ct.getType(), consult.getCode(), tempPatient.getName() + " " + IdCardUtil.getAgeForIdcard(tempPatient.getIdcard()), users, messages, "1");
        users.put(patient, 0);//+ " "+(tempPatient.getSex()==1?"(男 ":"(女 ") + IdCardUtil.getAgeForIdcard(tempPatient.getIdcard())+")"
        JSONObject obj = ImUtill.createTopics(patient + "_consult_" + ct.getType(), consult.getCode(), tempPatient.getName(), users, messages, "1");
        if (obj == null) {
            throw new RuntimeException("IM消息发送异常！");
        }
@@ -1565,6 +1565,7 @@ public class ConsultTeamService extends ConsultService {
                    throw new RuntimeException("im消息创建异常！" + obj == null ? "" : obj.getString("message"));
                }
                ct.setStartMsgId(obj.get("start_msg_id").toString());
                Thread.sleep(100);//消息发送顺序问题处理
                ImUtill.sendTopicIM(doctorTemp.getCode(), doctorTemp.getName(), consult.getCode(), "6", content);
                if (StringUtils.isNotBlank(consult.getImages())) {
                    String imgs[] = consult.getImages().split(",");

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/device/PatientDeviceService.java

@@ -99,7 +99,8 @@ public class PatientDeviceService extends BaseService {
			//校验sn码是否被使用
			if(needVerify) {
				PatientDevice device = patientDeviceDao.findByDeviceIdAndDeviceSnAndUserType(deviceId, sn, userType);
//				PatientDevice device = patientDeviceDao.findByDeviceIdAndDeviceSnAndUserType(deviceId, sn, userType);
				PatientDevice device = patientDeviceDao.findByDeviceSnAndUserType(sn, userType);
				if (device != null && !device.getId().equals(patientDevice.getId())) {
					throw new Exception("sn码" + sn + "已被使用！");
				}
@@ -227,7 +228,7 @@ public class PatientDeviceService extends BaseService {
		filters.put("patient", new SearchFilter("user", Operator.EQ, patientCode));
		filters.put("del", new SearchFilter("del", Operator.EQ, 0));
		//filters.put("del", new SearchFilter("del", Operator.EQ, 0));
		if(id > 0){
			filters.put("id", new SearchFilter("id", Operator.LT, id));

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwSmjkService.java

@@ -94,9 +94,9 @@ public class JwSmjkService {
                ex.printStackTrace();
            }
            if(re.equals("[{}]"))
            if(re.contains("[{}]"))
            {
                re = "";
                re = re.replace("[{}]","[]");
            }
            return re;
@@ -234,9 +234,9 @@ public class JwSmjkService {
                    throw new Exception("null response.");
                }
                if(re.equals("[{}]"))
                if(re.contains("[{}]"))
                {
                    re = "";
                    re = re.replace("[{}]","[]");
                }
                return re;
@@ -282,9 +282,9 @@ public class JwSmjkService {
                throw new Exception("null response.");
            }
            if(result.equals("[{}]"))
            if(result.contains("[{}]"))
            {
                result = "";
                result = result.replace("[{}]","[]");
            }
            return result;