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/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-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;
    }
}
*/