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/controller/synergy/customer/CustomerSynergyManageController.java

@@ -210,7 +210,7 @@ public class CustomerSynergyManageController extends BaseController {
    @ApiOperation(value = "获取催单列表")
    public String reminderList(@ApiParam(name="userCode",value="客服code",required = false)
                               @RequestParam(required = false)String userCode,
                               @ApiParam(name="receiveType",value="客服角色（1、客服，2、客服负责人）",required = false)
                               @ApiParam(name="receiveType",value="客服角色（1、客服，2、客服管理员）",required = false)
                               @RequestParam(required = false)Integer receiveType,
                               @ApiParam(name="sortType",value="排序（1、升序，2、降序）",required = false,defaultValue = "1")
                               @RequestParam(required = false,defaultValue = "1")Integer sortType,

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/account/CustomerService.java

@@ -636,6 +636,8 @@ public class CustomerService extends BaseService{
		manageSynergyWorkorderServicerDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
		manageSynergyWorkorderServicerDO.setCreateTime(new Date());
		manageSynergyWorkorderServicerDO.setCode(UUID.randomUUID().toString());
		manageSynergyWorkorderServicerDO.setServicePatientCode(callService.getPatient());
		manageSynergyWorkorderServicerDO.setServicePatientName(callService.getPatientName());
		manageSynergyWorkorderServicerDao.save(manageSynergyWorkorderServicerDO);
		
		manageSynergyWorkorderExecutorDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
@@ -715,6 +717,8 @@ public class CustomerService extends BaseService{
		
		
		manageSynergyWorkorderServicerDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
		manageSynergyWorkorderServicerDO.setServicePatientCode(callService.getPatient());
		manageSynergyWorkorderServicerDO.setServicePatientName(callService.getPatientName());
		manageSynergyWorkorderServicerDO.setCreateTime(new Date());
		manageSynergyWorkorderServicerDao.save(manageSynergyWorkorderServicerDO);
		

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

@@ -253,8 +253,11 @@ public class SynergyManageService extends BaseJpaService {
            map.put("serviceTime", DateUtil.dateToStr((Date)one.get("service_time"),"yyyy-MM-dd HH:mm"));//服务时间
            map.put("priority",one.get("priority"));//工单优先级
            map.put("priorityName",((Integer)one.get("priority"))==1?"加急":"普通");
            Integer overTime = isServiceOverTime((Date)one.get("service_time"));
            map.put("overTime",overTime);//是否超时
            if(one.get("service_time")!=null){//咨询、随访、预约的服务时间是null
                Integer overTime = isServiceOverTime((Date)one.get("service_time"));
                map.put("overTime",overTime);//是否超时
            }
            String[] servicer = (one.get("servicer_key")+"").split(",");
            map.put("servicer",servicer[0]);//服务对象
            map.put("servicerCount",one.get("servicer_count"));//服务对象人数
@@ -888,7 +891,8 @@ public class SynergyManageService extends BaseJpaService {
                 " LEFT JOIN manage_synergy_workorder_executor e on r.workorder_code=e.workorder_code " +
                 " where e.executor_code='"+userCode+"' and e.del=1 and r.deal_with=0 " +sort;
        }else if(receiveType==2){
            sql =" select r.* from manage_synergy_workorder_reminder r where r.principal_code='"+userCode+"' and r.deal_with=0 "+sort;
            sql =" select r.* from manage_synergy_workorder_reminder r " +
                 " LEFT JOIN manage_synergy_workorder w on r.workorder_code=w.code where w.status=1 and r.deal_with=0 "+sort;
        }
        List<Map<String,Object>> rstotal = jdbcTemplate.queryForList(sql);
        int count = 0;

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/WlyySignApplication.java

@@ -47,8 +47,8 @@ public class WlyySignApplication extends SpringBootServletInitializer {
        //加载续签数据
        Thread loadRenewSignThread = new Thread(new LoadRenewSignThread());
        loadRenewSignThread.start();
//        Thread loadRenewSignThread = new Thread(new LoadRenewSignThread());
//        loadRenewSignThread.start();
        return application.sources(WlyySignApplication.class);
    }

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/entity/FamilyLianQian.java

@@ -1,6 +1,9 @@
package com.yihu.wlyy.sign.entity;/**
/*
package com.yihu.wlyy.sign.entity;*/
/**
 * Created by nature of king on 2018/8/9.
 */
 *//*
import com.yihu.wlyy.entity.IdEntity;
@@ -8,15 +11,18 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
*/
/**
 * @author wangzhinan
 * @create 2018-08-09 10:27
 * @desc 家庭成员
 **/
 **//*
@Entity
@Table(name = "tbl_lianqian_family")
public class FamilyLianQian extends IdEntity implements Serializable {
   /* @Column(name = "address_code")
   */
/* @Column(name = "address_code")
    private String addressCode;//地址
    @Column(name = "relaholder")
    private String relaholder;//关系
@@ -196,5 +202,7 @@ public class FamilyLianQian extends IdEntity implements Serializable {
    public void setAddress(String address) {
        this.address = address;
    }*/
    }*//*
}
*/

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/entity/SignFamilyLianQian.java

@@ -1,3 +1,4 @@
/*
package com.yihu.wlyy.sign.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -9,11 +10,13 @@ import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.Date;
*/
/**
 *  莲前家庭医生签约
 *
 * @author George
 */
 *//*
@Entity
@Table(name = "wlyy_sign_family_lianqian")
public class SignFamilyLianQian extends IdEntity {
@@ -589,3 +592,4 @@ public class SignFamilyLianQian extends IdEntity {
        this.num = num;
    }
}
*/