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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/doctor/DoctorSynergyManageController.java

@@ -91,7 +91,7 @@ public class DoctorSynergyManageController extends BaseController {
    @RequestMapping(value = "createWorkorder", method = RequestMethod.POST)
    @ApiOperation("医生端-创建协同服务")
    public String workorderList(@ApiParam(name = "workorder", value = "工单对象", required = false)
    public String createWorkorder(@ApiParam(name = "workorder", value = "工单对象", required = false)
                                @RequestParam(value = "workorder")String workorder,
                                @ApiParam(name = "servicers", value = "服务对象", required = false)
                                @RequestParam(value = "servicers")String servicers){
@@ -111,6 +111,20 @@ public class DoctorSynergyManageController extends BaseController {
        }
    }
    @RequestMapping(value = "updateWorkorder", method = RequestMethod.POST)
    @ApiOperation("医生端-创建协同服务")
    public String updateWorkorder(@ApiParam(name = "workorder", value = "工单对象", required = false)
                                @RequestParam(value = "workorder")String workorder){
        try {
            ManageSynergyWorkorderDO workorderDO = objectMapper.readValue(workorder,ManageSynergyWorkorderDO.class);
            synergyManageService.updateWorkorder(workorderDO);
            return write(200, "获取成功");
        } catch (Exception e) {
            error(e);
            return error(-1, "请求失败");
        }
    }
    @RequestMapping(value = "selectByWorkorderCode", method = RequestMethod.POST)
    @ApiOperation("医生端-居民列表")
    public String selectByWorkorderCode(@ApiParam(name = "workorderCode", value = "工单code", required = false)

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -956,6 +956,24 @@ public class SynergyManageService extends BaseJpaService {
        }
    }
    /**
     * 更新工单
     *
     * @param manageSynergyWorkorderDO
     */
    public void updateWorkorder(ManageSynergyWorkorderDO manageSynergyWorkorderDO){
        ManageSynergyWorkorderDO  manageSynergyWorkorderDO1 = workOrderDao.findByCode(manageSynergyWorkorderDO.getCode());
        if(StringUtils.isNoneBlank(manageSynergyWorkorderDO.getRelationCodeName())){
            manageSynergyWorkorderDO1.setRelationCodeName(manageSynergyWorkorderDO.getRelationCodeName());
        }
        manageSynergyWorkorderDO1.setPriority(manageSynergyWorkorderDO.getPriority());
        manageSynergyWorkorderDO1.setServiceTime(manageSynergyWorkorderDO.getServiceTime());
        manageSynergyWorkorderDO1.setReturnedRemark(manageSynergyWorkorderDO.getReturnedRemark());
        manageSynergyWorkorderDO.setStatus(1);
        workOrderDao.save(manageSynergyWorkorderDO);
    }
    public String findByPatient(String patient){
        String response = null;
        String url = wlyyUrl + "third/synergy/findByPatient";

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -67,6 +67,53 @@ public class SynergyManageService extends BaseService {
        return rs;
    }
    public String updateWorkorder(String code,Integer type, String objectId, String serviceDate, Integer priority, String remark, String followupClass, String followupType) throws Exception {
        String response = null;
        JSONObject object = new JSONObject();
        object.put("code",code);
        object.put("serviceTime",serviceDate);
        object.put("priority",priority);
        object.put("remark",remark);
        if (type == 3){
            Followup followup = followUpDao.findOne(Long.parseLong(objectId));
            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            String a = serviceDate+":00";
            Date date = dateFormat.parse(serviceDate+":00");
            followup.setFollowupDate(date);
            followup.setFollowupType(followupType);
            followup.setFollowupClass(followupClass);
            followup = followUpDao.save(followup);
            if (followupClass.equals("1")){
                object.put("relationCodeName","高血压");
            }else if (followupClass.equals("2")){
                object.put("relationCodeName","糖尿病");
            }else if (followupClass.equals("1,2")){
                object.put("relationCodeName","高血压,糖尿病");
            }
        }
        String url = customerUrl + "synergy/doctor/updateWorkorder";
        Map<String, String> params = new HashMap<>();
        params.put("workorder",object.toString());
        response = httpClientUtil.httpPost(url,params);
        com.alibaba.fastjson.JSONObject object1 = JSON.parseObject(response);
        if (object1.getInteger("status")==200){
            return response;
        }else {
            throw new Exception("请求客服系统服务失败！");
        }
    }
    public String getWorkorById(String code) throws Exception {
        String response = null;
        String url = customerUrl + "synergy/doctor/getWorkorderInfo?workorderCode="+code;
        response = httpClientUtil.get(url,"UTF-8");
        com.alibaba.fastjson.JSONObject object1 = JSON.parseObject(response);
        if (object1.getInteger("status")==200){
            return object1.getJSONObject("data").toString();
        }else {
            throw new Exception("请求客服系统服务失败！");
        }
    }
    public String createWorkorder(String doctor, Set<String> patientSet, Integer type, String objectId, String serviceDate, Integer priority, String remark, String followupClass, String followupType) throws Exception {
        String response = null;
@@ -134,8 +181,10 @@ public class SynergyManageService extends BaseService {
            object.put("relationCode",followup.getId());
            if (followupClass.equals("1")){
                object.put("relationCodeName","高血压");
            }else if (followupClass.equals("1")){
            }else if (followupClass.equals("2")){
                object.put("relationCodeName","糖尿病");
            }else if (followupClass.equals("1,2")){
                object.put("relationCodeName","高血压,糖尿病");
            }
            object.put("createUserRole",1);
        }else if (type == 1){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/synergy/SynergyManageController.java

@@ -50,6 +50,76 @@ public class SynergyManageController extends BaseController {
        }
    }
    /**
     * 医生查看协同服务
     *
     * @param code
     * @return
     */
    @RequestMapping(value = "doctorGetSynergy", method = RequestMethod.POST)
    @ApiOperation("医生查看协同服务")
    public String doctorGetSynergy(
            @RequestParam(value = "code",required = true)String code){
        try {
            return  write(200,"请求成功","data",synergyManageService.getWorkorById(code));
        } catch (Exception e) {
            error(e);
            return error(-1,"请求失败");
        }
    }
    /**
     * 医生编辑协同服务
     *
     * @param code
     * @param objectId
     * @param type
     * @param serviceDate
     * @param priority
     * @param remark
     * @param followupClass
     * @param followupType
     * @return
     */
    @RequestMapping(value = "doctorUpdateSynergy", method = RequestMethod.POST)
    @ApiOperation("医生更新协同服务")
    public String doctorUpdateSynergy(
            @RequestParam(value = "code",required = true)String code,
            @RequestParam(value = "objectId", required = false) String objectId,
            @RequestParam(value = "type",required = false)Integer type,
            @RequestParam(value = "serviceDate",required = false)String serviceDate,
            @RequestParam(value = "priority",required = false)Integer priority,
            @RequestParam(value = "remark",required = false)String remark,
            @RequestParam(value = "followupClass",required = false)String followupClass,
            @RequestParam(value = "followupType",required = false)String followupType){
        try {
            synergyManageService.updateWorkorder(code,type,objectId,serviceDate,priority,remark,followupClass,followupType);
            return  write(200,"请求成功");
        } catch (Exception e) {
            error(e);
            return error(-1,"保存失败");
        }
    }
    /**
     * g派发工单
     *
     * @param patient
     * @param group
     * @param labelType
     * @param teamCode
     * @param objectId
     * @param type
     * @param serviceDate
     * @param priority
     * @param remark
     * @param followupClass
     * @param followupType
     * @return
     */
    @RequestMapping(value = "doctorCreateSynergy", method = RequestMethod.POST)
    @ApiOperation("医生派发协同服务")
    public String doctorSendArticleToPatients(