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

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

@@ -1,6 +1,8 @@
package com.yihu.wlyy.controller.synergy.customer;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.entity.User;
import com.yihu.wlyy.service.manager.user.UserService;
import com.yihu.wlyy.service.synergy.SynergyManageService;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -20,6 +22,8 @@ public class CustomerSynergyManageController extends BaseController {
    @Autowired
    private SynergyManageService synergyManageService;
    @Autowired
    private UserService userService;
    @RequestMapping(value = "/getWorkOrderInfo", method = {RequestMethod.GET, RequestMethod.POST})
    @ApiOperation(value = "获取协同服务工单信息")
@@ -36,6 +40,26 @@ public class CustomerSynergyManageController extends BaseController {
            error(e);
            return error(-1,"保存失败");
        }
    }
    @RequestMapping(value = "/dealWorkOrder",method = RequestMethod.POST)
    @ApiOperation(value = "处理协同服务")
    public String dealWorkOrder(@ApiParam(name="code",value="协同服务工单code")
                                    @RequestParam(required = true)String code,
                                @ApiParam(name="jsonData",value="接收负责人或者退回理由")
                                    @RequestParam(required = true)String jsonData,
                                @ApiParam(name="receiverCode",value="处理者code")
                                    @RequestParam(required = true)String receiverCode,
                                @ApiParam(name="status",value="2、接收，4、退回）")
                                    @RequestParam(required = true)Integer status){
        try {
            User user = userService.getUserByCode(receiverCode);
            synergyManageService.dealWorkOrder(code, user, jsonData, status);
            return write(200,"保存成功");
        }catch (Exception e){
            error(e);
            return error(-1,"保存失败");
        }
    }

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

@@ -35,7 +35,7 @@ public class ManageSynergyWorkorderDO extends IdEntity {
    private String servicerKey;//服务对象其中五个人
    private String receiverCode;//接收人code
    private String receiverName;//接收人名称
    private String receiverType;//接收人类型（1、医生，2、客服）
    private Integer receiverType;//接收人类型（1、医生，2、客服）
    private String hospital;//创建人所属机构code；
    private String hospitalName;//创建人所属机构名称
    private Date receiverTime;//工单（客服管理员）接收时间
@@ -221,11 +221,11 @@ public class ManageSynergyWorkorderDO extends IdEntity {
    }
    @Column(name = "receiver_type")
    public String getReceiverType() {
    public Integer getReceiverType() {
        return receiverType;
    }
    public void setReceiverType(String receiverType) {
    public void setReceiverType(Integer receiverType) {
        this.receiverType = receiverType;
    }

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

@@ -18,10 +18,7 @@ import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
 * Created by humingfen on 2018/09/27.
@@ -76,14 +73,16 @@ public class QuestionnaireManageService extends BaseJpaService {
        workOrderDao.save(workorderDO);
        //保存协同服务工单的服务对象
        List<ManageSynergyWorkorderServicerDO> list = new ArrayList<>();
        for(ManageSynergyWorkorderServicerDO servicerDO : workorderServicerDOS){
            servicerDO.setCode(getCode());
            servicerDO.setWorkorderType(workorderDO.getType());
            servicerDO.setWorkorderCode(workorderDO.getCode());
            servicerDO.setStatus(1);
            servicerDO.setCreateTime(new Date());
            workorderServicerDao.save(servicerDO);
            list.add(servicerDO);
        }
        workorderServicerDao.save(list);
        return true;
    }

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

@@ -1,13 +1,17 @@
package com.yihu.wlyy.service.synergy;
import com.yihu.wlyy.entity.User;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderExecutorDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerDO;
import com.yihu.wlyy.repository.UserDao;
import com.yihu.wlyy.repository.synergy.ManageSynergyWorkOrderDao;
import com.yihu.wlyy.repository.synergy.ManageSynergyWorkorderExecutorDao;
import com.yihu.wlyy.repository.synergy.ManageSynergyWorkorderServicerDao;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
@@ -21,7 +25,7 @@ import java.util.*;
 */
@Service
@Transactional
public class SynergyManageService {
public class SynergyManageService extends BaseJpaService {
    @Autowired
    JdbcTemplate jdbcTemplate;
@@ -31,6 +35,8 @@ public class SynergyManageService {
    private ManageSynergyWorkorderServicerDao workorderServicerDao;
    @Autowired
    private ManageSynergyWorkorderExecutorDao workorderExecutorDao;
    @Autowired
    private UserDao userDao;
    /**
     * 根据服务编码获取工单
@@ -340,4 +346,56 @@ public class SynergyManageService {
    }
    /**
     * 将管理员接收或者退回操作存入数据库
     * @param code
     * @param user
     * @param jsonData
     * @param status
     */
    public void dealWorkOrder(String code, User user, String jsonData, Integer status) {
        ManageSynergyWorkorderDO workorderDO = workOrderDao.findByCode(code);
        workorderDO.setStatus(status);
        workorderDO.setReceiverType(user.getType());
        workorderDO.setReceiverCode(user.getCode());
        workorderDO.setReceiverName(user.getName());
        JSONObject jsonObject = new JSONObject(jsonData);
        if(status == 4){
            workorderDO.setReturnedRemark(jsonObject.getString("returnedRemark"));
        }else if(status == 2){
            //创建负责人信息
            List<ManageSynergyWorkorderExecutorDO> list = new ArrayList<>();
            String manager = jsonObject.getString("manager");
            String[] managers = manager.split(",");
            for(String m : managers){
                ManageSynergyWorkorderExecutorDO executorDO = new ManageSynergyWorkorderExecutorDO();
                User u = userDao.findByCode(m);
                executorDO.setCode(getCode());
                executorDO.setWorkorderCode(code);
                executorDO.setExecutorType(1);
                executorDO.setExecutorCode(m);
                executorDO.setExecutorName(u.getName());
                executorDO.setDel(1);
                list.add(executorDO);
            }
            //保存协作者信息
            String collaborator = jsonObject.getString("collaborator");
            String[] collaborators = manager.split(",");
            for(String c : collaborators){
                ManageSynergyWorkorderExecutorDO executorDO = new ManageSynergyWorkorderExecutorDO();
                User u = userDao.findByCode(c);
                executorDO.setCode(getCode());
                executorDO.setWorkorderCode(code);
                executorDO.setExecutorType(1);
                executorDO.setExecutorCode(c);
                executorDO.setExecutorName(u.getName());
                executorDO.setDel(1);
                list.add(executorDO);
            }
            workorderExecutorDao.save(list);
        }
        workOrderDao.save(workorderDO);
    }
}