pc管理端设备管理导入功能

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/config/SpringSecurityConfig.java

@@ -38,6 +38,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
                "/admin/hos/importData",
                "/admin/hos/doctor/toExcel",
                "/admin/device/toExcel",
                "/admin/device/importData",
                "/admin/patientDevice/toExcel",
                "/admin/healthIndex/toExcel",
                "/admin/healthIndex/getExcelByFilter",

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/device/IotDeviceController.java

@@ -54,7 +54,7 @@ public class IotDeviceController extends BaseController {
    @RequestMapping(value = "findDeviceById",method = RequestMethod.GET)
    @ApiOperation("根据设备id查找设备管理")
    public String getDevice(@RequestParam(value = "id") Integer id){
    public String getDevice(@RequestParam(value = "id") Long id){
        try {
            WlyyDevice device = deviceService.findById(id);
            return  write(200,"操作成功","data",device);

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/device/WlyyDeviceController.java

@@ -5,6 +5,7 @@ import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.device.entity.WlyyDevice;
import com.yihu.wlyy.service.manager.device.WlyyDeviceService;
import jxl.Workbook;
import jxl.read.biff.BiffException;
import jxl.write.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -14,8 +15,10 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
@@ -71,7 +74,7 @@ public class WlyyDeviceController extends BaseController {
    @RequestMapping(value = "device")
    @ResponseBody
    public String getDevice(@RequestParam(value = "id") Integer id){
    public String getDevice(@RequestParam(value = "id") Long id){
        try {
            WlyyDevice device = deviceService.findById(id);
            return  write(200,"操作成功","data",device);
@@ -122,7 +125,7 @@ public class WlyyDeviceController extends BaseController {
    @RequestMapping(value = "delete")
    @ResponseBody
    public String deleteDevice(Integer id){
    public String deleteDevice(Long id){
        try{
            deviceService.deleteDevice(id);
            return write(200,"操作成功");
@@ -158,7 +161,26 @@ public class WlyyDeviceController extends BaseController {
            error(ex);
        }
    }
    
    //导入设备报表
    @RequestMapping(value = "importData", produces = "application/json;charset=UTF-8")
    @ResponseBody
    public String importData(HttpServletRequest request) {
        try {
            request.setCharacterEncoding("UTF-8");
            InputStream inputStream = request.getInputStream();
            Workbook workbook = Workbook.getWorkbook(inputStream);
            deviceService.importData(workbook);
            return write(200, "操作成功");
        } catch (IOException | BiffException e) {
            e.printStackTrace();
            error(e);
            return error(-1, "操作失败！");
        }
    }
    public void addHeader(WritableSheet ws) throws WriteException {
        
        String[] header = {"ID","设备名称","型号","SN码", "SIM卡号","机构名称", "联系人", "联系电话", "厂家名称"};

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/device/entity/WlyyDevice.java

@@ -1,48 +1,109 @@
package com.yihu.wlyy.device.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.*;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Administrator on 2016/12/1.
 * Created by Administrator on 2018/6/14.
 * 设备表
 */
@Entity
@Table(name = "wlyy_devices",catalog = "device",schema = "")
public class WlyyDevice {
    private Integer id;
    private Date applyDate; //申请日期
    private String orgName;//机构名称
    private String linkman;//联系人
    private String tel;//联系电话
    private String serverIp;//服务IP地址
@Table(name = "wlyy_devices")
public class WlyyDevice extends IdEntity{
    private String deviceName;//设备名称
    private String deviceModel;//设备型号
    private String deviceModel;//型号
    private String deviceCode;//设备唯一标识
    private String manufacturerCode;//厂家代码
    private String manufacturer;//厂家名称
    private Date applyDate;//申请日期
    private String orgName;//（居民）机构名称
    private String linkman;//联系人（居民）
    private String tel;//联系人（居民）电话
    private String serverIp;//服务IP地址
    private String manufacturerCode;//厂商代码threeNod:三诺 urion:优瑞恩 bioland:爱奥乐 comvee:康为
    private String address;//厂家地址
    private String representative;//法人代表
    private String applicantName;//申请注册人
    private String applicantIdentity;//申请人身份证号
    private String applicantTel;//申请人手机
    private String applicantMail;//申请人邮箱
    private String sim;//sim卡号
    private String applicantName;//申请注册人（发放人/医生）
    private String applicantIdentity;//申请人（发放人/医生）身份证号
    private String applicantTel;//申请人（发放人/医生）手机
    private String applicantMail;//申请人（发放人/医生）邮箱
    //1.4.8版本新增字段
    private String sim;//SIM卡
    private String manufacturerId;//厂商表的业务关联code
    private Integer isGrant;//是否发放（0否1是）
    private String grantAdminTeam;//发放的患者所在团队
    private String grantOrgCode;//发放所在机构
    private Integer isBinding;//是否绑定（0否 1 绑定单端口 2 绑定双端口）
    private String bindingCount;//绑定次数（{"1":"0", "2":"0"}）
    private Date grantTime;//发放时间
    /** default constructor */
    public WlyyDevice() {
    }
    /** full constructor */
    public WlyyDevice(String deviceName, String deviceModel, String deviceCode, String manufacturer, Date applyDate
            , String orgName, String linkman, String tel, String serverIp, String manufacturerCode, String address
            , String representative, String applicantName, String applicantIdentity, String applicantTel, String applicantMail) {
        this.deviceName = deviceName;
        this.deviceModel = deviceModel;
        this.deviceCode = deviceCode;
        this.manufacturer = manufacturer;
        this.applyDate = applyDate;
        this.orgName = orgName;
        this.linkman = linkman;
        this.tel = tel;
        this.serverIp = serverIp;
        this.manufacturerCode = manufacturerCode;
        this.address = address;
        this.representative = representative;
        this.applicantName = applicantName;
        this.applicantIdentity = applicantIdentity;
        this.applicantTel = applicantTel;
        this.applicantMail = applicantMail;
    }
    @Column(name = "device_name")
    public String getDeviceName() {
        return deviceName;
    }
    public void setDeviceName(String deviceName) {
        this.deviceName = deviceName;
    }
    @Column(name = "device_model")
    public String getDeviceModel() {
        return deviceModel;
    }
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
    public Integer getId() {
        return id;
    public void setDeviceModel(String deviceModel) {
        this.deviceModel = deviceModel;
    }
    public void setId(Integer id) {
        this.id = id;
    @Column(name = "device_code")
    public String getDeviceCode() {
        return deviceCode;
    }
    public void setDeviceCode(String deviceCode) {
        this.deviceCode = deviceCode;
    }
    @Column(name = "manufacturer")
    public String getManufacturer() {
        return manufacturer;
    }
    public void setManufacturer(String manufacturer) {
        this.manufacturer = manufacturer;
    }
    @Column(name = "apply_date")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getApplyDate() {
        return applyDate;
    }
@@ -60,6 +121,7 @@ public class WlyyDevice {
        this.orgName = orgName;
    }
    @Column(name = "linkman")
    public String getLinkman() {
        return linkman;
    }
@@ -68,6 +130,7 @@ public class WlyyDevice {
        this.linkman = linkman;
    }
    @Column(name = "tel")
    public String getTel() {
        return tel;
    }
@@ -85,35 +148,7 @@ public class WlyyDevice {
        this.serverIp = serverIp;
    }
    @Basic
    @Column(name = "device_name")
    public String getDeviceName() {
        return deviceName;
    }
    public void setDeviceName(String deviceName) {
        this.deviceName = deviceName;
    }
    @Column(name = "device_model")
    public String getDeviceModel() {
        return deviceModel;
    }
    public void setDeviceModel(String deviceModel) {
        this.deviceModel = deviceModel;
    }
    @Column(name = "device_code")
    public String getDeviceCode() {
        return deviceCode;
    }
    public void setDeviceCode(String deviceCode) {
        this.deviceCode = deviceCode;
    }
    @Column(name = "manufacturer_code")
    @Column(name = "manufacturerCode")
    public String getManufacturerCode() {
        return manufacturerCode;
    }
@@ -122,15 +157,7 @@ public class WlyyDevice {
        this.manufacturerCode = manufacturerCode;
    }
    @Column(name = "manufacturer")
    public String getManufacturer() {
        return manufacturer;
    }
    public void setManufacturer(String manufacturer) {
        this.manufacturer = manufacturer;
    }
    @Column(name = "address")
    public String getAddress() {
        return address;
    }
@@ -184,6 +211,15 @@ public class WlyyDevice {
        this.applicantMail = applicantMail;
    }
    @Column(name = "manufacturer_id")
    public String getManufacturerId() {
        return manufacturerId;
    }
    public void setManufacturerId(String manufacturerId) {
        this.manufacturerId = manufacturerId;
    }
    @Column(name = "sim")
    public String getSim() {
        return sim;
@@ -192,4 +228,58 @@ public class WlyyDevice {
    public void setSim(String sim) {
        this.sim = sim;
    }
    @Column(name = "is_grant")
    public Integer getIsGrant() {
        return isGrant;
    }
    public void setIsGrant(Integer grant) {
        isGrant = grant;
    }
    @Column(name = "grant_admin_team")
    public String getGrantAdminTeam() {
        return grantAdminTeam;
    }
    public void setGrantAdminTeam(String grantAdminTeam) {
        this.grantAdminTeam = grantAdminTeam;
    }
    @Column(name = "grant_org_code")
    public String getGrantOrgCode() {
        return grantOrgCode;
    }
    public void setGrantOrgCode(String grantOrgCode) {
        this.grantOrgCode = grantOrgCode;
    }
    @Column(name = "is_binding")
    public Integer getIsBinding() {
        return isBinding;
    }
    public void setIsBinding(Integer isBinding) {
        this.isBinding = isBinding;
    }
    @Column(name = "binding_count")
    public String getBindingCount() {
        return bindingCount;
    }
    public void setBindingCount(String bindingCount) {
        this.bindingCount = bindingCount;
    }
    @Column(name = "grant_time")
    public Date getGrantTime() {
        return grantTime;
    }
    public void setGrantTime(Date grantTime) {
        this.grantTime = grantTime;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/device/repository/DeviceManufacturerDao.java

@@ -10,9 +10,7 @@ import org.springframework.transaction.annotation.Transactional;
/**
 * Created by humingfen on 2018/6/6.
 */
public interface DeviceManufacturerDao extends PagingAndSortingRepository<DeviceManufacturer, Integer>, JpaSpecificationExecutor<DeviceManufacturer> {
    @Query("select dm from DeviceManufacturer dm where dm.id = ?1")
    DeviceManufacturer findById(Long id);
public interface DeviceManufacturerDao extends PagingAndSortingRepository<DeviceManufacturer, Long>, JpaSpecificationExecutor<DeviceManufacturer> {
    @Transactional
    @Modifying
@@ -21,8 +19,6 @@ public interface DeviceManufacturerDao extends PagingAndSortingRepository<Device
    DeviceManufacturer findByCode(String code);
    @Transactional
    @Modifying
    @Query("delete from DeviceManufacturer dm where dm.id = ?1")
    void delete(Long id);
    @Query("select dm.manufacturerCode from DeviceManufacturer dm where dm.code = ?1")
    String getManufacturerCodeByCode(String code);
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/device/repository/WlyyDeviceDao.java

@@ -4,11 +4,10 @@ import com.yihu.wlyy.device.entity.WlyyDevice;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by yww on 2016/12/1.
 */
public interface WlyyDeviceDao extends PagingAndSortingRepository<WlyyDevice, Integer>, JpaSpecificationExecutor<WlyyDevice> {
public interface WlyyDeviceDao extends PagingAndSortingRepository<WlyyDevice, Long>, JpaSpecificationExecutor<WlyyDevice> {
    WlyyDevice findByDeviceCode(String deviceCode);
}

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

@@ -1,108 +1,108 @@
//package com.yihu.wlyy.entity;
//
//import com.fasterxml.jackson.annotation.JsonFormat;
//
//import javax.persistence.Column;
//import javax.persistence.Entity;
//import javax.persistence.Table;
//import java.util.Date;
//
///**
// * 设备列表(设备厂家、设备信息）
// */
//@Entity
//@Table(name = "dm_device")
//public class DmDevice extends IdEntity {
//
//	private String categoryCode;
//	private String photo;
//	private String brands;
//	private String model;
//	private String isMultiUser;
//	private String multiUser;
//	private String name;
//	private Date czrq;
//	private String del;
//
//	@Column(name="category_code")
//	public String getCategoryCode() {
//		return categoryCode;
//	}
//
//	public void setCategoryCode(String categoryCode) {
//		this.categoryCode = categoryCode;
//	}
//
//	@Column(name="photo")
//	public String getPhoto() {
//		return photo;
//	}
//
//	public void setPhoto(String photo) {
//		this.photo = photo;
//	}
//
//	@Column(name="brands")
//	public String getBrands() {
//		return brands;
//	}
//
//	public void setBrands(String brands) {
//		this.brands = brands;
//	}
//
//	@Column(name="model")
//	public String getModel() {
//		return model;
//	}
//
//	public void setModel(String model) {
//		this.model = model;
//	}
//
//	@Column(name="is_multi_user")
//	public String getIsMultiUser() {
//		return isMultiUser;
//	}
//
//	public void setIsMultiUser(String isMultiUser) {
//		this.isMultiUser = isMultiUser;
//	}
//
//	@Column(name="multi_user")
//	public String getMultiUser() {
//		return multiUser;
//	}
//
//	public void setMultiUser(String multiUser) {
//		this.multiUser = multiUser;
//	}
//
//	@Column(name="name")
//	public String getName() {
//		return name;
//	}
//
//	public void setName(String name) {
//		this.name = name;
//	}
//
//	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
//	@Column(name="czrq")
//	public Date getCzrq() {
//		return czrq;
//	}
//
//	public void setCzrq(Date czrq) {
//		this.czrq = czrq;
//	}
//
//	@Column(name="del")
//	public String getDel() {
//		return del;
//	}
//
//	public void setDel(String del) {
//		this.del = del;
//	}
//}
package com.yihu.wlyy.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 设备列表(设备厂家、设备信息）
 */
@Entity
@Table(name = "dm_device")
public class DmDevice extends IdEntity {
	private String categoryCode;
	private String photo;
	private String brands;
	private String model;
	private String isMultiUser;
	private String multiUser;
	private String name;
	private Date czrq;
	private String del;
	@Column(name="category_code")
	public String getCategoryCode() {
		return categoryCode;
	}
	public void setCategoryCode(String categoryCode) {
		this.categoryCode = categoryCode;
	}
	@Column(name="photo")
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	@Column(name="brands")
	public String getBrands() {
		return brands;
	}
	public void setBrands(String brands) {
		this.brands = brands;
	}
	@Column(name="model")
	public String getModel() {
		return model;
	}
	public void setModel(String model) {
		this.model = model;
	}
	@Column(name="is_multi_user")
	public String getIsMultiUser() {
		return isMultiUser;
	}
	public void setIsMultiUser(String isMultiUser) {
		this.isMultiUser = isMultiUser;
	}
	@Column(name="multi_user")
	public String getMultiUser() {
		return multiUser;
	}
	public void setMultiUser(String multiUser) {
		this.multiUser = multiUser;
	}
	@Column(name="name")
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
	@Column(name="czrq")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	@Column(name="del")
	public String getDel() {
		return del;
	}
	public void setDel(String del) {
		this.del = del;
	}
}

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

@@ -7,7 +7,9 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
 * 患者信息
@@ -23,302 +25,356 @@ public class Patient extends IdEntity implements Serializable {
	 */
	private static final long serialVersionUID = 8358924836164389434L;
	// 业务主键
	private String code;
	// 身份证号
	private String idcard;
	// 登录密码
	private String password;
	private String salt;
	// 姓名
	private String name;
	// 生日
	private Date birthday;
	// 性別，1男，2女
	private Integer sex;
	// 手機號
	private String mobile;
	// 聯繫電話
	private String phone;
	// 社保卡號
	private String ssc;
	// 頭像HTTP地址
	private String photo;
	// 省代碼
	private String province;
	// 城市代碼
	private String city;
	// 區縣代碼
	private String town;
	// 街道代码
	private String street;
	// 省名
	private String provinceName;
	// 市名
	private String cityName;
	// 區縣名
	private String townName;
	// 街道名称
	private String streetName;
	// 地址
	private String address;
	// 疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病
	private Integer disease;
	private String diseaseName;
	// 病情：0绿标，1黄标，2红标
	private Integer diseaseCondition;
	private String diseaseConditionName;
	// 病历记录总数
	private Integer recordAmount;
	// 總積分
	private Integer points;
	// 更新時間
	private Date czrq;
	// 微信编号
	private String openid;
	// 用户状态：1正常，0禁用，-1恶意注册，2审核中
	private Integer status;
    //联系方式备注【基卫】mobile_remarks
    // 业务主键
    private String code;
    // 身份证号
    private String idcard;
    // 登录密码
    private String password;
    private String salt;
    // 姓名
    private String name;
    // 生日
    private Date birthday;
    // 性別，1男，2女
    private Integer sex;
    // 手機號
    private String mobile;
    // （基卫）手機號
    private String mobileRemarks;
	//微信开放平台主键
	private String unionId;
    // 聯繫電話
    private String phone;
    // 社保卡號
    private String ssc;
    // 頭像HTTP地址
    private String photo;
    // 省代碼
    private String province;
    // 城市代碼
    private String city;
    // 區縣代碼
    private String town;
    // 街道代码
    private String street;
    // 省名
    private String provinceName;
    // 市名
    private String cityName;
    // 區縣名
    private String townName;
    // 街道名称
    private String streetName;
    // 地址
    private String address;
    // 疾病类型，0健康，1高血压，2糖尿病，3高血压+糖尿病
    private Integer disease;
    // 病情：0绿标，1黄标，2红标
    private Integer diseaseCondition;
    // 病历记录总数
    private Integer recordAmount;
    // 總積分
    private Integer points;
    // 更新時間
    private Date czrq;
    // 微信编号
    private String openid;
    //微信时间
    private Date openidTime;
    // 用户状态：1正常，0禁用，-1恶意注册，2审核中
    private Integer status;
    // 居委会字段id
    private String sickVillage;
    // 居委会字段名称
    private String sickVillageName;
    //	绑定电子社保卡主体（本人为本人code，共济为操作人code）
    private String principalCode;
    //	是否绑定电子社保卡
    private Integer sicardStatus;
    //	绑定电子社保卡时间
    private Date sicardTime;
    //是否分配过微信标签  1分配过 0或者空没有
    private Integer isWxtag;
    //微信iagId
    private Integer wxtagid;
    //居民预警状态：0为标准，1为预警状态
    private Integer standardStatus;
    //医疗保险号
    private String medicareNumber;
    //微信开发平台唯一标识
    private String unionid;
    public String getPrincipalCode() {
        return principalCode;
    }
    public void setPrincipalCode(String principalCode) {
        this.principalCode = principalCode;
    }
    public Integer getSicardStatus() {
        return sicardStatus;
    }
    public void setSicardStatus(Integer sicardStatus) {
        this.sicardStatus = sicardStatus;
    }
    public Date getSicardTime() {
        return sicardTime;
    }
    public void setSicardTime(Date sicardTime) {
        this.sicardTime = sicardTime;
    }
    private List<SignPatientLabelInfo> labelInfos = new ArrayList<>();//患者的疾病标签list
    public Patient() {
    }
    public Patient(Long id) {
        this.id = id;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getIdcard() {
        return idcard;
    }
    public void setIdcard(String idcard) {
        this.idcard = idcard;
    }
    public String getPassword() {
        return password;
    }
    public void setPassword(String password) {
        this.password = password;
    }
    public String getSalt() {
        return salt;
    }
    public void setSalt(String salt) {
        this.salt = salt;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
    public Date getBirthday() {
        return birthday;
    }
	public Patient() {
	}
    public void setBirthday(Date birthday) {
        this.birthday = birthday;
    }
	public Patient(Long id) {
		this.id = id;
	}
    public Integer getSex() {
        return sex;
    }
	public String getCode() {
		return code;
	}
    public void setSex(Integer sex) {
        this.sex = sex;
    }
	public void setCode(String code) {
		this.code = code;
	}
    public String getMobile() {
        return mobile;
    }
	public String getIdcard() {
		return idcard;
	}
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
	public void setIdcard(String idcard) {
		this.idcard = idcard;
	}
    public String getPhone() {
        return phone;
    }
	public String getPassword() {
		return password;
	}
    public void setPhone(String phone) {
        this.phone = phone;
    }
	public void setPassword(String password) {
		this.password = password;
	}
    public String getSsc() {
        return ssc;
    }
	public String getSalt() {
		return salt;
	}
    public void setSsc(String ssc) {
        this.ssc = ssc;
    }
	public void setSalt(String salt) {
		this.salt = salt;
	}
    @Column(name = "photo", insertable = false)
    public String getPhoto() {
        return photo;
    }
	public String getName() {
		return name;
	}
    public void setPhoto(String photo) {
        this.photo = photo;
    }
	public void setName(String name) {
		this.name = name;
	}
    public String getProvince() {
        return province;
    }
	@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+08:00")
	public Date getBirthday() {
		return birthday;
	}
    public void setProvince(String province) {
        this.province = province;
    }
	public void setBirthday(Date birthday) {
		this.birthday = birthday;
	}
    public String getCity() {
        return city;
    }
	public Integer getSex() {
		return sex;
	}
    public void setCity(String city) {
        this.city = city;
    }
	public void setSex(Integer sex) {
		this.sex = sex;
	}
    public String getTown() {
        return town;
    }
	public String getMobile() {
		return mobile;
	}
    public void setTown(String town) {
        this.town = town;
    }
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}
    public String getStreet() {
        return street;
    }
	public String getPhone() {
		return phone;
	}
    public void setStreet(String street) {
        this.street = street;
    }
    @Column(name = "province_name")
    public String getProvinceName() {
        return provinceName;
    }
    public void setProvinceName(String provinceName) {
        this.provinceName = provinceName;
    }
    @Column(name = "city_name")
    public String getCityName() {
        return cityName;
    }
    public void setCityName(String cityName) {
        this.cityName = cityName;
    }
	public void setPhone(String phone) {
		this.phone = phone;
	}
    @Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
	public String getSsc() {
		return ssc;
	}
    public void setTownName(String townName) {
        this.townName = townName;
    }
    @Column(name = "street_name")
    public String getStreetName() {
        return streetName;
    }
    public void setStreetName(String streetName) {
        this.streetName = streetName;
    }
    public static long getSerialversionuid() {
        return serialVersionUID;
    }
    public String getAddress() {
        return address;
    }
    public void setAddress(String address) {
        this.address = address;
    }
    public Integer getDisease() {
        return disease;
    }
    public void setDisease(Integer disease) {
        this.disease = disease;
    }
    @Column(name = "disease_condition")
    public Integer getDiseaseCondition() {
        return diseaseCondition;
    }
    public void setDiseaseCondition(Integer diseaseCondition) {
        this.diseaseCondition = diseaseCondition;
    }
    @Column(name = "record_amount")
    public Integer getRecordAmount() {
        return recordAmount;
    }
    public void setRecordAmount(Integer recordAmount) {
        this.recordAmount = recordAmount;
    }
    public Integer getPoints() {
        return points;
    }
    public void setPoints(Integer points) {
        this.points = points;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    public Date getCzrq() {
        return czrq;
    }
    public void setCzrq(Date czrq) {
        this.czrq = czrq;
    }
    public String getOpenid() {
        return openid;
    }
    public void setOpenid(String openid) {
        this.openid = openid;
    }
	public void setSsc(String ssc) {
		this.ssc = ssc;
	}
	public String getPhoto() {
		return photo;
	}
	public void setPhoto(String photo) {
		this.photo = photo;
	}
	public String getProvince() {
		return province;
	}
	public void setProvince(String province) {
		this.province = province;
	}
	public String getCity() {
		return city;
	}
	public void setCity(String city) {
		this.city = city;
	}
	public String getTown() {
		return town;
	}
	public void setTown(String town) {
		this.town = town;
	}
	public String getStreet() {
		return street;
	}
	public void setStreet(String street) {
		this.street = street;
	}
	@Column(name = "province_name")
	public String getProvinceName() {
		return provinceName;
	}
	public void setProvinceName(String provinceName) {
		this.provinceName = provinceName;
	}
	@Column(name = "city_name")
	public String getCityName() {
		return cityName;
	}
	public void setCityName(String cityName) {
		this.cityName = cityName;
	}
	@Column(name = "town_name")
	public String getTownName() {
		return townName;
	}
	public void setTownName(String townName) {
		this.townName = townName;
	}
	@Column(name = "street_name")
	public String getStreetName() {
		return streetName;
	}
	public void setStreetName(String streetName) {
		this.streetName = streetName;
	}
	public static long getSerialversionuid() {
		return serialVersionUID;
	}
	public String getAddress() {
		return address;
	}
	public void setAddress(String address) {
		this.address = address;
	}
	public Integer getDisease() {
		return disease;
	}
	public void setDisease(Integer disease) {
		this.disease = disease;
	}
	@Column(name = "disease_condition")
	public Integer getDiseaseCondition() {
		return diseaseCondition;
	}
	public void setDiseaseCondition(Integer diseaseCondition) {
		this.diseaseCondition = diseaseCondition;
	}
	@Column(name = "record_amount")
	public Integer getRecordAmount() {
		return recordAmount;
	}
	public void setRecordAmount(Integer recordAmount) {
		this.recordAmount = recordAmount;
	}
	public Integer getPoints() {
		return points;
	}
	public void setPoints(Integer points) {
		this.points = points;
	}
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCzrq() {
		return czrq;
	}
	public void setCzrq(Date czrq) {
		this.czrq = czrq;
	}
	public String getOpenid() {
		return openid;
	}
	public void setOpenid(String openid) {
		this.openid = openid;
	}
    public Integer getStatus() {
		return status;
	}
        return status;
    }
	public void setStatus(Integer status) {
		this.status = status;
	}
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Transient
    public List<SignPatientLabelInfo> getLabelInfos() {
        return labelInfos;
    }
    public void setLabelInfos(List<SignPatientLabelInfo> labelInfos) {
        this.labelInfos = labelInfos;
    }
    @Column(name = "mobile_remarks")
    public String getMobileRemarks() {
        return mobileRemarks;
    }
@@ -327,57 +383,94 @@ public class Patient extends IdEntity implements Serializable {
        this.mobileRemarks = mobileRemarks;
    }
	public void setUnionId(String unionId) {
		this.unionId = unionId;
	}
	public String getUnionId() {
		return unionId;
	}
	@Transient
	public String getDiseaseName() {//0健康，1高血压，2糖尿病，3高血压+糖尿病
		if(disease==null){
			this.diseaseName = "";
			return diseaseName;
		}
		if(0==disease) {
			this.diseaseName = "健康";
		}else if(1==disease) {
			this.diseaseName = "高血压";
		}else if(2==disease) {
			this.diseaseName = "糖尿病";
		}else if(3==disease) {
			this.diseaseName = "高血压+糖尿病";
		}else{
			this.diseaseName = "";
		}
		return diseaseName;
	}
	public void setDiseaseName(String diseaseName) {
		this.diseaseName = diseaseName;
	}
	@Transient
	public String getDiseaseConditionName() {
		if(null==diseaseCondition){
			this.diseaseConditionName = "";
			return diseaseConditionName;
		}
		if(0==diseaseCondition) {
			this.diseaseConditionName = "绿标";
		}else if(1==diseaseCondition) {
			this.diseaseConditionName = "黄标";
		}else if(2==diseaseCondition) {
			this.diseaseConditionName = "红标";
		}else{
			this.diseaseConditionName = "";
		}
		return diseaseConditionName;
	}
	public void setDiseaseConditionName(String diseaseConditionName) {
		this.diseaseConditionName = diseaseConditionName;
	}
    public Date getOpenidTime() {
        return openidTime;
    }
    public void setOpenidTime(Date openidTime) {
        this.openidTime = openidTime;
    }
    public String getSickVillage() {
        return sickVillage;
    }
    public void setSickVillage(String sickVillage) {
        this.sickVillage = sickVillage;
    }
    public String getSickVillageName() {
        return sickVillageName;
    }
    public void setSickVillageName(String sickVillageName) {
        this.sickVillageName = sickVillageName;
    }
    public Integer getIsWxtag() {
        return isWxtag;
    }
    public void setIsWxtag(Integer isWxtag) {
        this.isWxtag = isWxtag;
    }
    public Integer getWxtagid() {
        return wxtagid;
    }
    public void setWxtagid(Integer wxtagid) {
        this.wxtagid = wxtagid;
    }
    //---------------------------常量----------------------------
    public enum isWchatTage {
        yes(1), no(0);
        isWchatTage(Integer value) {
            this.value = value;
        }
        private Integer value;
        public Integer getValue() {
            return value;
        }
        public void setValue(Integer value) {
            this.value = value;
        }
    }
    public Integer getStandardStatus() {
        return standardStatus;
    }
    public void setStandardStatus(Integer standardStatus) {
        this.standardStatus = standardStatus;
    }
    public Patient(String code, String name) {
        this.code = code;
        this.name = name;
    }
    public Patient(String code) {
        this.code = code;
    }
    public String getMedicareNumber() {
        return medicareNumber;
    }
    public void setMedicareNumber(String medicareNumber) {
        this.medicareNumber = medicareNumber;
    }
    public String getUnionid() {
        return unionid;
    }
    public void setUnionid(String unionid) {
        this.unionid = unionid;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/repository/DmDeviceDao.java

@@ -1,12 +1,13 @@
//package com.yihu.wlyy.repository;
//
//
//import com.yihu.wlyy.entity.DmDevice;
//import org.springframework.data.repository.PagingAndSortingRepository;
//
///**
// * Created by Administrator on 2017/1/18.
// */
//public interface DmDeviceDao extends PagingAndSortingRepository<DmDevice,Long> {
//
//}
package com.yihu.wlyy.repository;
import com.yihu.wlyy.entity.DmDevice;
import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * Created by Administrator on 2018/6/14.
 */
public interface DmDeviceDao extends PagingAndSortingRepository<DmDevice,Long> {
    DmDevice findByModel(String deviceModel);
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/DeviceManufacturerService.java

@@ -50,7 +50,7 @@ public class DeviceManufacturerService  {
    public DeviceManufacturer findById(Long id) {
        return deviceManufacturerDao.findById(id);
        return deviceManufacturerDao.findOne(id);
    }
    public void  updateManufacturer(DeviceManufacturer manufacturer) {

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/device/WlyyDeviceService.java

@@ -1,7 +1,15 @@
package com.yihu.wlyy.service.manager.device;
        import com.yihu.wlyy.device.entity.WlyyDevice;
import com.yihu.wlyy.device.entity.DeviceManufacturer;
import com.yihu.wlyy.device.entity.WlyyDevice;
import com.yihu.wlyy.device.repository.DeviceManufacturerDao;
import com.yihu.wlyy.device.repository.WlyyDeviceDao;
import com.yihu.wlyy.entity.DmDevice;
import com.yihu.wlyy.repository.DmDeviceDao;
import com.yihu.wlyy.service.common.excel.ExcelData;
import com.yihu.wlyy.util.ReadExcelUtil;
import jxl.Sheet;
import jxl.Workbook;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
@@ -12,10 +20,9 @@ import org.springframework.transaction.annotation.Transactional;
import org.springside.modules.persistence.DynamicSpecifications;
import org.springside.modules.persistence.SearchFilter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
/**
 * Created by yww on 2016/12/1.
@@ -25,8 +32,12 @@ import java.util.Map;
public class WlyyDeviceService {
    @Autowired
    private WlyyDeviceDao deviceDao;
    @Autowired
    private DeviceManufacturerDao deviceManufacturerDao;
    @Autowired
    private DmDeviceDao dmDeviceDao;
    public WlyyDevice findById(Integer id){
    public WlyyDevice findById(Long id){
        return deviceDao.findOne(id);
    }
@@ -60,6 +71,27 @@ public class WlyyDeviceService {
    @Transactional
    public WlyyDevice createDevice(WlyyDevice device){
        device.setApplyDate(new Date());
        String manufacturerCode = deviceManufacturerDao.getManufacturerCodeByCode(device.getManufacturerId());
        device.setManufacturerCode(manufacturerCode);
        //根据型号设置绑定次数形式
        if(device.getDeviceModel() != null) {
            DmDevice dmDevice = dmDeviceDao.findByModel(device.getDeviceModel());
            if(dmDevice == null) {
                if(device.getDeviceName().contains("血糖")) {
                    device.setBindingCount("{\"1\":\"0\"}");
                }else if(device.getDeviceName().contains("血压")) {
                    device.setBindingCount("{\"1\":\"0\", \"2\":\"0\"}");
                }
            }else {
                if(dmDevice.getIsMultiUser().equals("1")) {
                    device.setBindingCount("{\"1\":\"0\", \"2\":\"0\"}");
                }else if(dmDevice.getIsMultiUser().equals("0")) {
                    device.setBindingCount("{\"1\":\"0\"}");
                }
            }
        }
        device.setIsGrant(0);
        device.setIsBinding(0);
        WlyyDevice deviceNew = deviceDao.save(device);
        return deviceNew;
    }
@@ -70,6 +102,8 @@ public class WlyyDeviceService {
        if(deviceNew == null){
            return null;
        }
        String manufacturerCode = deviceManufacturerDao.getManufacturerCodeByCode(device.getManufacturerId());
        deviceNew.setManufacturerCode(manufacturerCode);
        deviceNew.setOrgName(device.getOrgName());
        deviceNew.setLinkman(device.getLinkman());
        deviceNew.setTel(device.getTel());
@@ -77,7 +111,7 @@ public class WlyyDeviceService {
        deviceNew.setDeviceName(device.getDeviceName());
        deviceNew.setDeviceModel(device.getDeviceModel());
        deviceNew.setDeviceCode(device.getDeviceCode());
        deviceNew.setManufacturerCode(device.getManufacturerCode());
        deviceNew.setManufacturerId(device.getManufacturerId());
        deviceNew.setManufacturer(device.getManufacturer());
        deviceNew.setAddress(device.getAddress());
        deviceNew.setRepresentative(device.getRepresentative());
@@ -90,7 +124,7 @@ public class WlyyDeviceService {
    }
    @Transactional
    public boolean deleteDevice(Integer id){
    public boolean deleteDevice(Long id){
        deviceDao.delete(id);
        return true;
    }
@@ -121,4 +155,215 @@ public class WlyyDeviceService {
        Specification<WlyyDevice> spec = DynamicSpecifications.bySearchFilter(filter.values(), WlyyDevice.class);
        return deviceDao.findAll(spec);
    }
    public boolean importData(Workbook workbook) {
        Sheet[] sheets = workbook.getSheets();
        Sheet sheet = sheets[0];
        int rows = ReadExcelUtil.getRightRows(sheet);
        List<WlyyDevice> deviceList = new ArrayList<>();
        for (int row = 1; row < rows; row++) {  //索引从0开始，第一行为标题
            WlyyDevice device = new WlyyDevice();
            Map<Integer, ExcelData> mapping = mappingDevice(device);
            int finalRow = row;
            mapping.forEach((index, excelData) -> {
                String value = sheet.getCell(index, finalRow).getContents().trim();
                excelData.transform(value);
            });
            //判断设备厂商是否存在，不存在则存入
            if(StringUtils.isNotBlank(device.getManufacturerId())) {
                DeviceManufacturer manufacturer = deviceManufacturerDao.findByCode(device.getManufacturerId());
                if (manufacturer == null) {
                    manufacturer.setCode(device.getManufacturerId());
                    manufacturer.setManufacturerCode(device.getManufacturerCode());
                    manufacturer.setManufacturerName(device.getManufacturer());
                    manufacturer.setCzrq(new Date());
                    deviceManufacturerDao.save(manufacturer);
                }
            }
            device.setIsGrant(0);
            device.setIsBinding(0);
            deviceList.add(device);
        }
        deviceDao.save(deviceList);
        return true;
    }
    private Map<Integer, ExcelData> mappingDevice(WlyyDevice device) {
        Map<Integer, ExcelData> dataMap = new HashMap<>();
        //申请日期
        dataMap.put(1, new ExcelData() {
            @Override
            public void transform(String data) {
                if(StringUtils.isNotBlank(data)) {
                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                    try {
                        device.setApplyDate(simpleDateFormat.parse(data));
                    } catch (ParseException e) {
                        e.printStackTrace();
                    }
                }
            }
        });
        //机构名称
        dataMap.put(2, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setOrgName(data);
            }
        });
        //联系人
        dataMap.put(3, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setLinkman(data);
            }
        });
        //联系电话
        dataMap.put(4, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setTel(data);
            }
        });
        //服务IP地址
        dataMap.put(5, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setServerIp(data);
            }
        });
        //设备名称
        dataMap.put(6, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setDeviceName(data);
            }
        });
        //设备型号
        dataMap.put(7, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setDeviceModel(data);
            }
        });
        //设备唯一标识
        dataMap.put(8, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setDeviceCode(data);
            }
        });
        //厂商代码
        dataMap.put(9, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setManufacturerCode(data);
            }
        });
        //厂商名称
        dataMap.put(10, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setManufacturer(data);
            }
        });
        //厂商地址
        dataMap.put(11, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setAddress(data);
            }
        });
        //法人代表
        dataMap.put(12, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setRepresentative(data);
            }
        });
        //申请注册人
        dataMap.put(13, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setApplicantName(data);
            }
        });
        //申请人身份证号
        dataMap.put(14, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setApplicantIdentity(data);
            }
        });
        //申请人手机
        dataMap.put(15, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setApplicantTel(data);
            }
        });
        //申请人邮箱
        dataMap.put(16, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setApplicantMail(data);
            }
        });
        //SIM卡号
        dataMap.put(17, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setSim(data);
            }
        });
        //厂商表关联id
        dataMap.put(18, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setManufacturerId(data);
            }
        });
        //发放的患者所在团队
        dataMap.put(19, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setGrantAdminTeam(data);
            }
        });
        //发放所在机构
        dataMap.put(20, new ExcelData() {
            @Override
            public void transform(String data) {
                device.setGrantOrgCode(data);
            }
        });
        //根据仪器名称设定绑定次数
        dataMap.put(21, new ExcelData() {
            @Override
            public void transform(String data) {
                if(data.contains("血压")) {
                    device.setBindingCount("{\"1\":\"0\", \"2\":\"0\"}");
                } else if(data.contains("血糖")){
                    device.setBindingCount("{\"1\":\"0\"}");
                }
            }
        });
        //发放时间
        dataMap.put(22, new ExcelData() {
            @Override
            public void transform(String data) {
                if(StringUtils.isNotBlank(data)) {
                    try {
                        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                        device.setGrantTime(simpleDateFormat.parse(data));
                    } catch (ParseException e) {
                        e.printStackTrace();
                    }
                }
            }
        });
        return dataMap;
    }
}

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_create_js.jsp

@@ -52,7 +52,7 @@
                        for (var i = 0; i < data.data.length; i++) {
                            d.push({
                                text: data.data[i].manufacturerName,
                                id: data.data[i].manufacturerCode
                                id: data.data[i].code
                            });
                        }
                        that.initInpCat( d, that);
@@ -99,7 +99,7 @@
						var values = self.$form.Fields.getValues();
						//厂家代码
						values.manufacturerCode = $("#sel_manufacturer").ligerComboBox("getValue");
						values.manufacturerId = $("#sel_manufacturer").ligerComboBox("getValue");
						if (!validator.validate()) {
							return;

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_list.jsp

@@ -51,6 +51,14 @@
			</div>
			</sec:authorize>
			<sec:authorize url="/admin/device/importData">
				<div class="m-form-control m-form-control-fr">
					<div id="btn_import" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam f-mr20">
						<div id="div_file_picker" class="f-mt10" style="margin-top:-10px;">导入</div>
					</div>
				</div>
			</sec:authorize>
			<sec:authorize url="/admin/device/create">
			<div class="m-form-control m-form-control-fr">

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_list_js.jsp

@@ -202,7 +202,33 @@
								self.delRecord(id, code);
							}
						});
					})
					});
                    var uploader = $("#btn_import").webupload({
                        server: ctx + "/admin/device/importData",
                        pick: {id: '#div_file_picker'},
                        accept: {
                            title: 'Excel',
                            extensions: 'xls',
                            mimeTypes: '.xls'
                        },
                        auto: true
                    });
                    uploader.on('beforeSend', function (file, data, headers) {
                    });
                    uploader.on('uploadProgress', function (file, percentage) {
                        $.ligerDialog.waitting('正在保存中,请稍候...');
                    });
                    uploader.on('uploadError', function (file) {
                        $.ligerDialog.closeWaitting();
                        $.Notice.error("上传失败！");
                    });
                    uploader.on('uploadSuccess', function (file, resp) {
                        $.ligerDialog.closeWaitting();
                        $.Notice.success("上传成功。");
                    });
				}
			};

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/device/device_modify_js.jsp

@@ -46,7 +46,7 @@
                        parms: {},
                        dataParmName: "data",
                        textField: "manufacturerName",
                        valueField: "manufacturerCode",
                        valueField: "code",
                        isMultiSelect: false,
                        ajaxBeforeSend: function (xhr) {
                            if (ajaxHeaderName) {
@@ -93,7 +93,7 @@
									applicantMail: data.applicantMail,
								});
								//填值
								_this.manufacturerBox.selectValue(data.manufacturerCode);
								_this.manufacturerBox.selectValue(data.manufacturerId);
							} else {
								$.Notice.error(result.msg);
							}
@@ -158,7 +158,7 @@
						var values = self.$form.Fields.getValues();
						//厂家名称
						values.manufacturerCode = self.manufacturerBox.getValue();
						values.manufacturerId = self.manufacturerBox.getValue();
                        values.manufacturer = self.manufacturerBox.getText();
						if (!validator.validate()) {
							return;