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

# Conflicts:
#	patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/customer/CustomerSynergyManageController.java
#	patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/customer/CustomerSynergyManageController.java

@@ -355,5 +355,19 @@ public class CustomerSynergyManageController extends BaseController {
            return invalidUserException(e, -1, "新增临时随访记录失败！" + e.getMessage());
        }
    }
    @ApiOperation("保存随访项目数据")
    @RequestMapping(value = "/saveFollowupProjectData", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ResponseBody
    public String saveFollowupProjectData(@ApiParam(name = "followup", value = "随访项目对象")
                                          @RequestParam(value = "followup", required = true)String followup ) {
        try {
            synergyManageService.saveFollowupProjectData(followup);
            return write(200, "保存随访项目数据成功！");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "保存随访项目数据失败！" + e.getMessage());
        }
    }
}

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

@@ -6,13 +6,13 @@ import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerDO;
import com.yihu.wlyy.service.synergy.SynergyManageService;
import com.yihu.wlyy.service.synergy.SynergyWorkorderServicerLogService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
@@ -34,6 +34,8 @@ public class DoctorSynergyManageController extends BaseController {
    private SynergyManageService synergyManageService;
    @Autowired
    private ObjectMapper objectMapper;
    @Autowired
    private SynergyWorkorderServicerLogService workorderServicerLogService;
    @RequestMapping(value = "workorderList", method = RequestMethod.GET)
    @ApiOperation("医生端-协同服务列表")
@@ -104,4 +106,16 @@ public class DoctorSynergyManageController extends BaseController {
            return error(-1, "请求失败");
        }
    }
    @RequestMapping(value = "selectByWorkorderCode", method = RequestMethod.POST)
    @ApiOperation("医生端-居民列表")
    public String selectByWorkorderCode(@ApiParam(name = "workorderCode", value = "工单code", required = false)
                           @RequestParam(value = "workorderCode", required = false)String workorderCode){
        try {
            return write(200, "请求成功","data",workorderServicerLogService.selectByWorkorderCode(workorderCode));
        }catch (Exception e){
            error(e);
            return error(-1, "请求失败");
        }
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/synergy/ManageSynergyWorkorderDO.java

@@ -60,7 +60,7 @@ public class ManageSynergyWorkorderDO extends IdEntity {
    }
    @Column(name = "service_time")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm")
    public Date getServiceTime() {
        return serviceTime;
    }

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

@@ -2,14 +2,21 @@ package com.yihu.wlyy.service.synergy;/**
 * Created by nature of king on 2018/10/9.
 */
import com.yihu.wlyy.entity.Patient;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerLogDO;
import com.yihu.wlyy.repository.PatientDao;
import com.yihu.wlyy.repository.synergy.ManageSynergyWorkorderServicerLogDao;
import com.yihu.wlyy.util.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
 * @author wangzhinan
@@ -21,6 +28,11 @@ import java.util.Date;
public class SynergyWorkorderServicerLogService extends BaseJpaService {
    @Autowired
    private ManageSynergyWorkorderServicerLogDao manageSynergyWorkorderServicerLogDao;
    @Autowired
    private PatientDao patientDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
@@ -32,4 +44,22 @@ public class SynergyWorkorderServicerLogService extends BaseJpaService {
        synergyWorkorderServicerLogDO.setCreateTime(new Date());
        manageSynergyWorkorderServicerLogDao.save(synergyWorkorderServicerLogDO);
    }
    /**
     * 根据工单code获取服务对象
     *
     * @param workorderCode 工单code
     * @return
     */
    public List<Patient> selectByWorkorderCode(String workorderCode){
        String sql = "select * from manage_synergy_workorder_servicer where workorder_code = '"+workorderCode+"'";
        List<ManageSynergyWorkorderServicerDO> workorderServicerDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ManageSynergyWorkorderServicerDO.class));
        List<Patient> patients = new ArrayList<>();
        for (ManageSynergyWorkorderServicerDO workorderServicerDO:workorderServicerDOS){
            Patient patient = patientDao.findByCode(workorderServicerDO.getServicePatientCode());
            patients.add(patient);
        }
        return patients;
    }
}

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

@@ -1,5 +1,6 @@
package com.yihu.wlyy.service.synergy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.followup.Followup;
@@ -14,6 +15,7 @@ import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.HttpClientUtil;
import com.yihu.wlyy.util.IdCardUtil;
import com.yihu.wlyy.util.http.HttpResponse;
import com.yihu.wlyy.util.http.HttpUtils;
import org.apache.commons.collections.map.HashedMap;
@@ -61,7 +63,7 @@ public class ManageSynergyService extends BaseService {
    }
    public String createWorkorder(String doctor, Set<String> patientSet, Integer type, String objectId, String serviceDate, Integer priority, String remark, String followupClass, String followupType){
    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;
        JSONArray array = new JSONArray();
        String patientCode1 = null;
@@ -130,12 +132,14 @@ public class ManageSynergyService extends BaseService {
        String url = customerUrl + "followup/saveFollowupProjectData";
        Map<String, String> params = new HashMap<>();
        params.put("servicers",array.toJSONString());
        try {
            response = httpClientUtil.httpPost(url,params);
        } catch (Exception e) {
            e.printStackTrace();
        response = httpClientUtil.httpPost(url,params);
        com.alibaba.fastjson.JSONObject object1 = JSON.parseObject(response);
        if (object.getInteger("status")==200){
            return response;
        }else {
            throw new Exception("请求客服系统服务失败！");
        }
        return response;
    }
@@ -171,4 +175,31 @@ public class ManageSynergyService extends BaseService {
        }
        throw new Exception("请求客服系统服务失败！");
    }
    /**
     *
     * @param workorderCode
     * @return
     * @throws Exception
     */
    public String selectByWorkorderCode(String workorderCode) throws Exception{
        String response = null;
        Map<String, String> params = new HashMap<>();
        params.put("workorderCode",workorderCode);
        String url = customerUrl + "/synergy/doctor/selectByWorkorderCode";
        com.alibaba.fastjson.JSONObject object = null;
        try {
            response = httpClientUtil.httpPost(url,params);
            object = JSON.parseObject(response);
            JSONArray array = object.getJSONArray("data");
            for (int i=0;i<array.size();i++){
                com.alibaba.fastjson.JSONObject jsonObject = array.getJSONObject(i);
                jsonObject.put("birth", IdCardUtil.getAgeForIdcard(jsonObject.getString("idcard")));
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
        return object.toString();
    }
}

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

@@ -1,5 +1,6 @@
package com.yihu.wlyy.service.synergy;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.followup.Followup;
@@ -61,7 +62,7 @@ public class SynergyManageService extends BaseService {
    }
    public String createWorkorder(String doctor, Set<String> patientSet, Integer type, String objectId, String serviceDate, Integer priority, String remark, String followupClass, String followupType){
    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;
        JSONArray array = new JSONArray();
        String patientCode1 = null;
@@ -136,12 +137,13 @@ public class SynergyManageService extends BaseService {
        Map<String, String> params = new HashMap<>();
        params.put("servicers",array.toJSONString());
        params.put("workorder",object.toJSONString());
        try {
            response = httpClientUtil.httpPost(url,params);
        } catch (Exception e) {
            e.printStackTrace();
        response = httpClientUtil.httpPost(url,params);
        com.alibaba.fastjson.JSONObject object1 = JSON.parseObject(response);
        if (object1.getInteger("status")==200){
            return response;
        }else {
            throw new Exception("请求客服系统服务失败！");
        }
        return response;
    }

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

@@ -2,8 +2,8 @@ package com.yihu.wlyy.web.doctor.synergy;
import com.yihu.wlyy.service.jimeiJkEdu.JMJkEduArticleService;
import com.yihu.wlyy.service.synergy.ManageSynergyService;
import com.yihu.wlyy.service.synergy.SynergyManageService;
import com.yihu.wlyy.web.BaseController;
import com.yihu.wlyy.web.third.gateway.vo.base.BaseResultModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -30,6 +30,8 @@ public class SynergyManageController extends BaseController {
    @Autowired
    private ManageSynergyService manageSynergyService;
    @Autowired
    private SynergyManageService synergyManageService;
    @Autowired
    private JMJkEduArticleService jmJkEduArticleService;
    @RequestMapping(value = "/getWorkOrderInfo", method = {RequestMethod.GET, RequestMethod.POST})
@@ -49,8 +51,8 @@ public class SynergyManageController extends BaseController {
    }
    @RequestMapping(value = "doctorCreateSynergy", method = RequestMethod.POST)
    @ApiOperation("医生创建系统服务")
    public BaseResultModel doctorSendArticleToPatients(
    @ApiOperation("医生派发协同服务")
    public String doctorSendArticleToPatients(
            @RequestParam(value = "patient", required = false) String patient,
            @RequestParam(value = "group", required = false) String group,
            @RequestParam(value = "labelType", required = false) String labelType,
@@ -67,7 +69,7 @@ public class SynergyManageController extends BaseController {
            String[] patients = new String[]{};
            String[] groups = new String[]{};
            if (StringUtils.isEmpty(patient) && StringUtils.isEmpty(group)) {
                return new BaseResultModel("请至少选择一个患者！");
                return  write(200,"请至少选择一个患者！");
            }else{
                if(StringUtils.isNotBlank(patient)){
                    if(patient.contains(",")){
@@ -85,19 +87,19 @@ public class SynergyManageController extends BaseController {
                }
            }
            if (patients.length == 0 && groups.length == 0) {
                return new BaseResultModel("请至少选择一个患者！");
                return  write(200,"请至少选择一个患者！");
            }
            Set<String> patientSet = new HashSet<>(); //放入set中可以去重复
            jmJkEduArticleService.initPatients(getUID(),groups, group,labelType,teamCode,patients,patientSet);
//            jmJkEduArticleService.initPatient(getUID(),groups,group,labelType,teamCode,patients,patientSet);
            if (patientSet.size() == 0) {
                return new BaseResultModel("请至少选择一个患者！");
                return  write(200,"请至少选择一个患者！");
            }
            manageSynergyService.createWorkorder(getUID(),patientSet,type,objectId,serviceDate,priority,remark,followupClass,followupType);
            return new BaseResultModel();
            synergyManageService.createWorkorder(getUID(),patientSet,type,objectId,serviceDate,priority,remark,followupClass,followupType);
            return  write(200,"请求成功");
        } catch (Exception e) {
            error(e);
            return new BaseResultModel(BaseResultModel.statusEm.opera_error.getCode(), BaseResultModel.statusEm.opera_error.getMessage() + ":" + e.getMessage());
            return error(-1,"保存失败");
        }
    }
@@ -148,4 +150,23 @@ public class SynergyManageController extends BaseController {
            return error(-1, "请求失败");
        }
    }
    /**
     * 居民列表
     *
     * @param workorderCode
     * @return
     */
    @RequestMapping(value = "selectByWorkorderCode", method = RequestMethod.POST)
    @ApiOperation("医生端-居民列表")
    public String selectByWorkorderCode(@ApiParam(name = "workorderCode", value = "工单code", required = false)
                                        @RequestParam(value = "workorderCode", required = false)String workorderCode){
        try {
            return write(200, "请求成功","data",manageSynergyService.selectByWorkorderCode(workorderCode));
        }catch (Exception e){
            error(e);
            return error(-1, "请求失败");
        }
    }
}

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

@@ -52,7 +52,7 @@ rehabilitation:
  url: http://localhost:10055/svr-wlyy-rehabilitation/
#集美客服配置
customerService:
  url: http://localhost:8082/
  url: http://localhost:8180/
#小程序
applets: