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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/config/SpringSecurityConfig.java

@@ -58,7 +58,8 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
                "/admin/surveyAdvice/**",
                "/admin/surveyTemplateAdvice/**",
                "/admin/paylog/**",
                "/admin/static/consult/**"
                "/admin/static/consult/**",
                "/admin/specialist/hospitalServiceItem/importData"
        );
    }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/specialist/HopsitalServiceItemController.java

@@ -32,7 +32,7 @@ public class HopsitalServiceItemController extends BaseController {
    @RequestMapping(value = "initial")
    public String listInit() {
        return "desizenMan/new-institutional-projects";
        return "desizenMan/service_project_management";
    }
@@ -64,9 +64,10 @@ public class HopsitalServiceItemController extends BaseController {
     */
    @RequestMapping(value = "selectHospital", method = RequestMethod.POST)
    @ResponseBody
    public String selectHospitals(@RequestParam(name = "hospitalName") String hospitalName){
    public String selectHospitals(@RequestParam(name = "hospitalName",required = false) String hospitalName,
                                  @RequestParam(name = "grade",required = false) Integer grade){
        try {
            return write(200, "查询成功", "data",specialistHospitalItemService.selectHospital(hospitalName));
            return write(200, "查询成功", "data",specialistHospitalItemService.selectHospital(hospitalName,grade));
        } catch (Exception ex) {
            error(ex);
            return error(-1, "查询失败");
@@ -121,9 +122,10 @@ public class HopsitalServiceItemController extends BaseController {
    @RequestMapping(value = "deleteHospitalItem", method = RequestMethod.POST)
    @ResponseBody
    public String delete(@RequestParam(name = "serviceItem",required = false) String serviceItem,
                                    @RequestParam(name = "hospital",required = false) String hospital){
                                    @RequestParam(name = "hospital",required = false) String hospital,
                         @RequestParam(name = "id",required = false) String id){
        try {
            return write(200, "删除成功", "data",specialistHospitalItemService.delete(serviceItem,hospital));
            return write(200, "删除成功", "data",specialistHospitalItemService.delete(serviceItem,hospital,id));
        } catch (Exception ex) {
            error(ex);
            return error(-1, "删除失败");

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/specialist/ServiceItemController.java

@@ -81,7 +81,7 @@ public class ServiceItemController  extends BaseController {
     * @param pageSize
     * @return
     */
    @RequestMapping(value = "selectServiceItem", method = RequestMethod.POST)
    @RequestMapping(value = "selectServiceItem", method = RequestMethod.GET)
    @ResponseBody
    public String selectServiceItem(@RequestParam(name = "serviceItem") String serviceItem,
                                    @RequestParam(name = "page",defaultValue = "1")Integer page,

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/specialist/SpecialistHospitalItemService.java

@@ -18,6 +18,8 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
@@ -45,6 +47,8 @@ public class SpecialistHospitalItemService extends BaseService {
    private SystemDictDao systemDictDao;
    @Autowired
    private HttpClientUtil httpClientUtil;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
     * 获取url
@@ -67,14 +71,20 @@ public class SpecialistHospitalItemService extends BaseService {
     *
     * @return
     */
    public List<Hospital> selectHospital(String hospitalName){
    public List<Hospital> selectHospital(String hospitalName,Integer grade){
        List<Hospital> hospitals = new ArrayList<>();
        if (StringUtils.isNoneBlank(hospitalName)){
            Hospital hospital = new Hospital();
            hospital = hospitalDao.findByName(hospitalName);
            hospitals.add(hospital);
        if (StringUtils.isNoneBlank(hospitalName) &&  grade != 0){
            String sql = "select * from dm_hospital where name like '%"+hospitalName+"%' AND grade = "+grade;
            hospitals = jdbcTemplate.query(sql,new BeanPropertyRowMapper(Hospital.class));
        } else if (StringUtils.isNoneBlank(hospitalName)){
            String sql = "select * from dm_hospital where name like '%"+hospitalName+"%'";
            hospitals = jdbcTemplate.query(sql,new BeanPropertyRowMapper(Hospital.class));
        }else if (grade != 0){
            String sql = "select * from dm_hospital where grade = "+grade+"";
            hospitals = jdbcTemplate.query(sql,new BeanPropertyRowMapper(Hospital.class));
        }else {
            hospitals = hospitalDao.findAllHospital();
        }
        hospitals = hospitalDao.findAllHospital();
        return hospitals;
    }
@@ -150,12 +160,13 @@ public class SpecialistHospitalItemService extends BaseService {
    /**
     * 删除机构服务项目
     */
    public JSONObject delete(String serviceItem,String hospital){
    public JSONObject delete(String serviceItem,String hospital,String id){
        String response = null;
        String url =getBaseUrl() + "deleteHospitalItem";
        Map<String,String> params = new HashMap<>();
        params.put("hospital",hospital);
        params.put("serviceItem",serviceItem);
        params.put("id",id);
        try {
            response = httpClientUtil.httpPost(url,params);
        }catch (Exception e){

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

@@ -66,6 +66,8 @@ public class DeviceDetailService extends BaseService {
		String hospital = "";
		String isFirstBind = "";
		String hospitalName = "";
		String doctorCode ="";
		String doctorName="";
		String keyType = "1";
		if ("2".equals(patientDevice.getUserType())){
			keyType="2";
@@ -74,10 +76,12 @@ public class DeviceDetailService extends BaseService {
			adminTeam = signFamily.getAdminTeamId();
			hospital = signFamily.getHospital();
			hospitalName = signFamily.getHospitalName();
			doctorCode = signFamily.getDoctor();
			doctorName = signFamily.getDoctorName();
		}
		//设备表没有数据则插入一条数据
		if (deviceDetail==null){
			insertDevice(patientDevice,String.valueOf(adminTeam),hospitalName,hospital,"",1);
			insertDevice(patientDevice,String.valueOf(adminTeam),hospitalName,hospital,"",doctorCode,doctorName,1);
			deviceDetail = deviceDetailDao.findBySn(patientDevice.getDeviceSn());
		}
@@ -90,16 +94,16 @@ public class DeviceDetailService extends BaseService {
		}
		if (isFirst){
			String updateFirstSql ="update device.wlyy_devices dd set dd.is_grant=1,dd.grant_admin_team=?,dd.grant_org_code=?,dd.binding_count=?,dd.grant_time = ?,dd.org_name=?,dd.is_binding=1 where dd.device_code=?";
			jdbcTemplate.update(updateFirstSql,new Object[]{String.valueOf(adminTeam),hospital,isFirstBind,grantTime,hospitalName,patientDevice.getDeviceSn()});
			String updateFirstSql ="update device.wlyy_devices dd set dd.is_grant=1,dd.grant_admin_team=?,dd.grant_org_code=?,dd.binding_count=?,dd.grant_time = ?,dd.org_name=?,dd.grant_doctor=?,dd.grant_doctor_name=?,dd.is_binding=1 where dd.device_code=?";
			jdbcTemplate.update(updateFirstSql,new Object[]{String.valueOf(adminTeam),hospital,isFirstBind,grantTime,hospitalName,doctorCode,doctorName,patientDevice.getDeviceSn()});
			//deviceDetailDao.updateAfterBindingFirst(String.valueOf(adminTeam),hospital,isFirstBind,grantTime,patientDevice.getDeviceSn());
		}else {
			List<PatientDevice> patientDeviceList = patientDeviceDao.findByDeviceSn(patientDevice.getDeviceSn());
			int patientDeviceSize = patientDeviceList.size();
			String updateSql = "";
			if (bind == 0){
				updateSql ="update device.wlyy_devices dd set dd.is_grant=1,dd.grant_admin_team=?,dd.grant_org_code=?,dd.binding_count=?,dd.is_binding=?,dd.org_name=?  where dd.device_code=?";
				jdbcTemplate.update(updateSql,new Object[]{String.valueOf(adminTeam),hospital,isFirstBind,patientDeviceSize,hospitalName,patientDevice.getDeviceSn()});
				updateSql ="update device.wlyy_devices dd set dd.is_grant=1,dd.grant_admin_team=?,dd.grant_org_code=?,dd.binding_count=?,dd.is_binding=?,dd.org_name=?,dd.grant_doctor=?,dd.grant_doctor_name=?  where dd.device_code=?";
				jdbcTemplate.update(updateSql,new Object[]{String.valueOf(adminTeam),hospital,isFirstBind,patientDeviceSize,hospitalName,doctorCode,doctorName,patientDevice.getDeviceSn()});
			}else if (bind>0){
				updateSql ="update device.wlyy_devices dd set dd.is_grant=1,dd.binding_count=?,dd.is_binding=? where dd.device_code=?";
				jdbcTemplate.update(updateSql,new Object[]{isFirstBind,patientDeviceSize,patientDevice.getDeviceSn()});
@@ -118,7 +122,7 @@ public class DeviceDetailService extends BaseService {
	 * @param isBind 0未绑定  1已绑定
	 * @throws Exception
	 */
	public void insertDevice(PatientDevice patientDevice, String adminTeam, String orgName, String orgCode,String bindCount,int isBind)throws Exception{
	public void insertDevice(PatientDevice patientDevice, String adminTeam, String orgName, String orgCode,String bindCount,String doctorCode,String doctorName,int isBind)throws Exception{
		//获取原始数据
		DeviceDetail deviceDetail = new DeviceDetail();
		Patient patient = patientDao.findByCode(patientDevice.getUser());
@@ -133,6 +137,8 @@ public class DeviceDetailService extends BaseService {
		deviceDetail.setGrantTime(patientDevice.getCzrq());
		deviceDetail.setApplyDate(DateUtil.getStringDate("yyyy-MM-dd HH:mm:ss"));
		deviceDetail.setOrgName(orgName);
		deviceDetail.setGrantDoctor(doctorCode);
		deviceDetail.setGrantDoctorName(doctorName);
		if (isBind>0){
			deviceDetail.setIsGrant(1);
			deviceDetail.setIsBinding(1);

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

@@ -1214,6 +1214,8 @@ public class PatientDeviceService extends BaseService {
            String orgCode ="";
            String orgName="";
            String bingCount="";
            String doctorCode = "";
            String doctorName = "";
            if (Integer.valueOf(userType)>0){
                bingCount="{\"1\":\"0\",\"2\":\"0\"}";
            }else {
@@ -1223,8 +1225,10 @@ public class PatientDeviceService extends BaseService {
                adminTeam = signFamily.getAdminTeamId();
                orgCode = signFamily.getHospital();
                orgName=signFamily.getHospitalName();
                doctorCode = signFamily.getDoctor();
                doctorName = signFamily.getDoctorName();
            }
            deviceDetailService.insertDevice(patientDevice,String.valueOf(adminTeam),orgName,orgCode,bingCount,0);
            deviceDetailService.insertDevice(patientDevice,String.valueOf(adminTeam),orgName,orgCode,bingCount,doctorCode,doctorName,0);
        }
        if (deviceDetail!=null && StringUtils.isNotEmpty(deviceDetail.getBindingCount())){
            JSONObject jsonObject =new JSONObject(String.valueOf(deviceDetail.getBindingCount()));

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistService.java

@@ -147,7 +147,7 @@ public class SpecialistService extends BaseService {
        param.put("assistant", assistant);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/getAssistantPatientCount", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs.getLong("obj");
        }
        return 0L;
@@ -160,7 +160,7 @@ public class SpecialistService extends BaseService {
        param.put("size", size);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findPatientNoAssistant", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs;
        }
        return rs;
@@ -218,7 +218,7 @@ public class SpecialistService extends BaseService {
        param.put("labelCode", labelCode);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/getLabelpatientCount", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs.getLong("obj");
        }
        return 0L;
@@ -230,7 +230,7 @@ public class SpecialistService extends BaseService {
        param.put("doctor", doctor);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findSpecialistPatientRelationCout", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs.getLong("obj");
        }
        return 0L;
@@ -241,7 +241,7 @@ public class SpecialistService extends BaseService {
        param.put("doctor", doctor);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findNoLabelPatientRelation", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs.getJSONArray("obj");
        }
        return null;
@@ -255,7 +255,7 @@ public class SpecialistService extends BaseService {
        param.put("size", size);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findPatientRelatioByAssistant", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs.getJSONArray("obj");
        }
        return null;
@@ -267,7 +267,7 @@ public class SpecialistService extends BaseService {
        param.put("json", json);
        HttpResponse response = HttpUtils.doPost(specialistUrl + "svr-specialist/saveHealthAssistant", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs.getBoolean("obj");
        }
        return false;
@@ -364,7 +364,7 @@ public class SpecialistService extends BaseService {
        param.put("size", size);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/getDoctorPatientByName", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs.getJSONArray("obj");
        }
        return null;
@@ -466,7 +466,7 @@ public class SpecialistService extends BaseService {
            param.put("teamCode", teamCode);
            HttpResponse response = HttpUtils.doPost(specialistUrl + "svr-specialist/signSpecialistTeam", param);
            JSONObject rs = new JSONObject(response.getContent());
            if ("succes".equals(rs.getString("message"))) {
            if ("success".equals(rs.getString("message"))) {
                String[] str = disease.split(",");
                for (String ds : str) {
@@ -562,7 +562,7 @@ public class SpecialistService extends BaseService {
        HttpResponse response = HttpUtils.doPost(specialistUrl + "svr-specialist/agreeSpecialistTeam", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            //置空消息
            if (mesId != null) {
@@ -653,7 +653,7 @@ public class SpecialistService extends BaseService {
        param.put("code", code);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findPatientSigninfo", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            if (StringUtils.isNoneBlank(messageCode)){
                Message message = messageDao.findByCode(messageCode);
                message.setRead(0);
@@ -681,7 +681,7 @@ public class SpecialistService extends BaseService {
        param.put("patient", patient);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findPatientTeamList", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            JSONArray jr = rs.getJSONArray("obj");
            for(int i=0;i<rs.getJSONArray("obj").length();i++){
                JSONObject j = jr.getJSONObject(i);
@@ -699,7 +699,7 @@ public class SpecialistService extends BaseService {
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findPatientSignSpecialist", param);
        if(StringUtils.isNotBlank(response.getContent())) {
            JSONObject rs = new JSONObject(response.getContent());
            if ("succes".equals(rs.getString("message"))) {
            if ("success".equals(rs.getString("message"))) {
                return rs.getJSONArray("obj");
            }
        }
@@ -712,7 +712,7 @@ public class SpecialistService extends BaseService {
        param.put("doctor", doctor);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findPatientSignSpecialistInfo", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            JSONObject j =rs.getJSONObject("obj");
            String relationCode =  j.getString("relationCode");
            j.put("server",patientDiseaseServerDao.findBySpecialistRelationCodeAndDel(relationCode,"1"));
@@ -787,7 +787,7 @@ public class SpecialistService extends BaseService {
            param.put("patient", patient);
            HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findPatientTeamList", param);
            JSONObject rs = new JSONObject(response.getContent());
            if ("succes".equals(rs.getString("message"))) {
            if ("success".equals(rs.getString("message"))) {
                JSONArray jr = rs.getJSONArray("obj");
                if(jr!=null&&jr.length()>0){
                    return true;
@@ -806,7 +806,7 @@ public class SpecialistService extends BaseService {
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findDoctorAndDoctorHealthBySpecialDoctor", param);
        if(StringUtils.isNotBlank(response.getContent())) {
            JSONObject rs = new JSONObject(response.getContent());
            if ("succes".equals(rs.getString("message"))) {
            if ("success".equals(rs.getString("message"))) {
                return rs.getJSONArray("obj");
            }
        }
@@ -820,7 +820,7 @@ public class SpecialistService extends BaseService {
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/findSpecialistSignFamilyPatientCout", param);
        if(StringUtils.isNotBlank(response.getContent())) {
            JSONObject rs = new JSONObject(response.getContent());
            if ("succes".equals(rs.getString("message"))) {
            if ("success".equals(rs.getString("message"))) {
                return rs.getLong("obj");
            }
        }
@@ -837,7 +837,7 @@ public class SpecialistService extends BaseService {
        param.put("size", size);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/getSpecialistSignFamilyPatientByName", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs.getJSONArray("obj");
        }
        return null;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/rehabilitation/RehabilitationManageService.java

@@ -59,7 +59,7 @@ public class RehabilitationManageService extends BaseService {
    private String serviceDoctorList = "/svr-specialist/serviceDoctorList";//康复管理-医生端居民详情服务医生列表
    private String appCalendarPlanDetailList = "/svr-specialist/appCalendarPlanDetailList";//康复管理-app端、微信端计划的服务项目列表
    private String dailyJob = "/svr-specialist/dailyJob";//每日康复服务通知
    private String saveRehabilitationOperateRecodr ="/svr-specialist/saveRehabilitationOperateRecodr";//新增operateRecodr
    private String saveRehabilitationOperateRecord ="/svr-specialist/saveRehabilitationOperateRecord";//新增operateRecodr
    private String updateNoteAndImageRehabilitationOperate ="/svr-specialist/updateNoteAndImageRehabilitationOperate";//康复计划完成时更新服务完成笔记和图片接口;
    private String updatePlanDetailStatusById = "/svr-specialist/updatePlanDetailStatusById";//康复管理-更新康复计划服务项目状态
    /************************************************************* end ************************************************************************/
@@ -368,10 +368,10 @@ public class RehabilitationManageService extends BaseService {
        throw new Exception("请求微服务失败！");
    }
    public String createServiceQrCode(String planDetailId,String sessionId) throws Exception{
    public String createServiceQrCode(String planDetailId,String doctorCode) throws Exception{
        Map<String, Object> param = new HashedMap();
        param.put("planDetailId", planDetailId);
        param.put("sessionId", sessionId);
        param.put("doctorCode", doctorCode);
        //specialistUrl= "http://localhost:10051";
        HttpResponse response = HttpUtils.doPost(specialistUrl + createServiceQrCode, param);
        JSONObject result = new JSONObject(response.getContent());
@@ -463,7 +463,7 @@ public class RehabilitationManageService extends BaseService {
    }
    public JSONObject saveRehabilitationOperateRecodr(String dataJson) throws Exception{
    public JSONObject saveRehabilitationOperateRecord(String dataJson) throws Exception{
        Map<String, Object> param = new HashedMap();
        JSONObject json = new JSONObject(dataJson);
        if(json.has("patientCode")){
@@ -474,9 +474,10 @@ public class RehabilitationManageService extends BaseService {
            Doctor doctor = doctorDao.findByCode(json.get("doctorCode")+"");
            json.put("doctorName",doctor!=null?doctor.getName():"");
        }
        param.put("dataJson", json.toString());
        String resultJsonStr = json.toString();
        param.put("dataJson", resultJsonStr);
        //specialistUrl= "http://localhost:10051";
        HttpResponse response = HttpUtils.doPost(specialistUrl + saveRehabilitationOperateRecodr, param);
        HttpResponse response = HttpUtils.doPost(specialistUrl + saveRehabilitationOperateRecord, param);
        JSONObject result = new JSONObject(response.getContent());
        return  result;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/template/DoctorTeamGuidanceService.java

@@ -72,12 +72,12 @@ public class DoctorTeamGuidanceService extends BaseService {
    public String saveTeamGuidance(String doctor, String title, JSONArray teams, String content, String images,String labelCode) throws Exception {
        String templateCode = getCode();
        Date nowDate = new Date();
        String image = "";
        if (StringUtils.isNotEmpty(images)) {
//            只限本地路径上传到FastDFS
            image = CommonUtil.copyTempImage(images);
            System.out.println("images =====>" + image);
        }
//        String image = "";
//        if (StringUtils.isNotEmpty(images)) {
////            只限本地路径上传到FastDFS
//            image = CommonUtil.copyTempImage(images);
//            System.out.println("images =====>" + image);
//        }
        //指导标签
        DoctorGuidanceTempLabel doctorGuidanceTempLable =  doctorGuidanceTempLableDao.findByCode(labelCode);
        String labelName = "未分组";
@@ -118,7 +118,7 @@ public class DoctorTeamGuidanceService extends BaseService {
        doctorTeamGuidanceDetail.setContent(content);
        doctorTeamGuidanceDetail.setCreateTime(nowDate);
        doctorTeamGuidanceDetail.setCzrq(nowDate);
        doctorTeamGuidanceDetail.setImagesUrl(image);
        doctorTeamGuidanceDetail.setImagesUrl(images);
        doctorTeamGuidanceDetailDao.save(doctorTeamGuidanceDetail);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/SystemDataRedis.java

@@ -2,6 +2,9 @@ package com.yihu.wlyy.util;
import com.yihu.wlyy.entity.security.Token;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
@@ -15,6 +18,8 @@ import java.util.Set;
@Component
public class SystemDataRedis {
    private static Logger logger = LoggerFactory.getLogger(SystemDataRedis.class);
    @Autowired
    private StringRedisTemplate redisTemplate;
@@ -98,9 +103,19 @@ public class SystemDataRedis {
     * @return
     */
    public Token getToken(String tokenTypeName,String uid) {
        String tokenJosn = redisTemplate.opsForValue().get("token:" + tokenTypeName + ":" + uid);
        Token token = (Token)JSONObject.toBean(JSONObject.fromObject(tokenJosn),Token.class);
        return token;
        try{
            //获取token
            String tokenJosn = redisTemplate.opsForValue().get("token:" + tokenTypeName + ":" + uid);
            if(StringUtils.isNotBlank(tokenJosn)){
                Token token = (Token)JSONObject.toBean(JSONObject.fromObject(tokenJosn),Token.class);
                return token;
            }
            return null;
        }catch (Exception e){
            logger.info("getToken:"+e.getMessage());
        }
        return null;
    }
    /**

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandingService.java

@@ -475,10 +475,14 @@ public class DataHandingService {
                String adminTeam="";
                String orgName ="";
                String orCode ="";
                String doctorCode ="";
                String doctorName="";
                if (signFamily!=null){
                    adminTeam=String.valueOf(signFamily.getAdminTeamId());
                    orgName = signFamily.getHospitalName();
                    orCode = signFamily.getHospital();
                    doctorCode = signFamily.getDoctor();
                    doctorName = signFamily.getDoctorName();
                }
                if (Integer.valueOf(patientDevice.getUserType())>0 && Integer.valueOf(patientDevice.getUserType())==1){
                    bindCount = "{\"1\":\"1\",\"2\":\"0\"}";
@@ -487,7 +491,7 @@ public class DataHandingService {
                }else if (Integer.valueOf(patientDevice.getUserType())<0){
                    bindCount = "{\"1\":\"1\"}";
                }
                deviceDetailService.insertDevice(patientDevice,adminTeam,orgName,orCode,bindCount,1);
                deviceDetailService.insertDevice(patientDevice,adminTeam,orgName,orCode,bindCount,doctorCode,doctorName,1);
            }
        }
        String[] sqlStr = new String[sqlList.size()];

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/specialist/rehabilitation/DoctorRehabilitationManageController.java

@@ -254,13 +254,13 @@ public class DoctorRehabilitationManageController extends BaseController {
    }
    @RequestMapping(value = "createServiceQrCode", method = RequestMethod.POST)
    @ApiOperation("康复管理-根据康复计划明细id和对话sessionId生成服务码")
    @ApiOperation("康复管理-根据康复计划明细id和医生code生成服务码")
    @ObserverRequired
    public String createServiceQrCode(@ApiParam(name = "planDetailId", value = "康复计划项目明细ID")@RequestParam(value = "planDetailId", required = true)String planDetailId,
                                      @ApiParam(name = "sessionId", value = "IM对话sessionId")@RequestParam(value = "sessionId", required = true)String sessionId){
                                      @ApiParam(name = "doctorCode", value = "医生code")@RequestParam(value = "doctorCode", required = true)String doctorCode){
        try {
            return write(200, "获取二维码成功！", "data", rehabilitationManageService.createServiceQrCode(planDetailId,sessionId));
            return write(200, "获取二维码成功！", "data", rehabilitationManageService.createServiceQrCode(planDetailId,doctorCode));
        } catch (Exception e) {
            error(e);
            return error(-1, "请求二维码失败");
@@ -319,13 +319,12 @@ public class DoctorRehabilitationManageController extends BaseController {
        }
    }
    @RequestMapping(value = "saveRehabilitationOperateRecodr", method = RequestMethod.POST)
    @ApiOperation("康复管理-新增operateRecodr")
    @RequestMapping(value = "saveRehabilitationOperateRecord", method = RequestMethod.POST)
    @ApiOperation("康复管理-新增operateRecord")
    @ObserverRequired
    public String saveRehabilitationOperateRecodr(@ApiParam(name = "dataJson", value = "实体json",defaultValue = "{\"rehabilitationDetailId\":\"402803f6657f195301657f4fbd3c0001\",\"patientCode\":\"00\",\"patientName\":\"11\",\"doctorCode\":\"22\",\"doctorName\":\"33\",\"node\":\"jjjjjj\",\"relationRecordType\":\"4\",\"relation_record_code\":\"55\",\"relationRecordImg\":\"666666\",\"status\":\"0\"}")@RequestParam(value = "dataJson", required = true)String dataJson){
    public String saveRehabilitationOperateRecord(@ApiParam(name = "dataJson", value = "实体json",defaultValue = "{\"rehabilitationDetailId\":\"402803f6657f195301657f4fbd3c0001\",\"patientCode\":\"00\",\"patientName\":\"11\",\"doctorCode\":\"22\",\"doctorName\":\"33\",\"node\":\"jjjjjj\",\"relationRecordType\":\"4\",\"relation_record_code\":\"55\",\"relationRecordImg\":\"666666\",\"status\":\"0\"}")@RequestParam(value = "dataJson", required = true)String dataJson){
        try {
            JSONObject result = rehabilitationManageService.saveRehabilitationOperateRecodr(dataJson);
            JSONObject result = rehabilitationManageService.saveRehabilitationOperateRecord(dataJson);
            if(result.getInt("status")==200){
                return write(200, "新增康复计划日志成功！", "data", result.getJSONObject("obj"));
            }else {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/specialist/rehabilitation/PatientRehabilitationManageController.java

@@ -21,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
/**
 * Created by 刘文彬 on 2018/8/30.
 */
@@ -128,13 +130,31 @@ public class PatientRehabilitationManageController extends BaseController {
        try {
            JSONObject result = rehabilitationManageService.checkAfterQrCode(planDetailId,patientCode);
            return write(200, String.valueOf(result.get("message")), "data", result.get("obj"));
            return write(200, String.valueOf(result.get("message")), "data", result.getJSONObject("obj"));
        } catch (Exception e) {
            error(e);
            return error(-1, "验证失败");
        }
    }
    @RequestMapping(value = "saveRehabilitationOperateRecord", method = RequestMethod.POST)
    @ApiOperation("康复管理-新增operateRecord")
    @ObserverRequired
    public String saveRehabilitationOperateRecord(@ApiParam(name = "dataJson", value = "实体json",defaultValue = "{\"rehabilitationDetailId\":\"402803f6657f195301657f4fbd3c0001\",\"patientCode\":\"00\",\"patientName\":\"11\",\"doctorCode\":\"22\",\"doctorName\":\"33\",\"node\":\"jjjjjj\",\"relationRecordType\":\"4\",\"relation_record_code\":\"55\",\"relationRecordImg\":\"666666\",\"status\":\"0\"}")@RequestParam(value = "dataJson", required = true)String dataJson){
        try {
            JSONObject result = rehabilitationManageService.saveRehabilitationOperateRecord(dataJson);
            if(result.getInt("status")==200){
                return write(200, "新增康复计划日志成功！", "data", result.getJSONObject("obj"));
            }else {
                return error(-1, result.getString("message"));
            }
        } catch (Exception e) {
            error(e);
            return error(-1, "新增康复计划日志失败！");
        }
    }
    @RequestMapping(value = "recentPlanDetailRecord", method = RequestMethod.GET)
    @ApiOperation("康复管理-近期康复相关记录")
    @ObserverRequired

patient-co/patient-co-wlyy/src/main/resources/application-dev.yml

@@ -33,6 +33,7 @@ doctorAssistant:
im:
  im_list_get: http://172.19.103.88:3000/
  #im_list_get: http://192.168.131.24:3000/
  data_base_name: ichat
#专病配置