代码修改

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

@@ -3,7 +3,6 @@ package com.yihu.wlyy.device.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date;
/**
@@ -30,6 +29,7 @@ public class WlyyDevice {
    private String applicantIdentity;//申请人身份证号
    private String applicantTel;//申请人手机
    private String applicantMail;//申请人邮箱
    private String sim;//sim卡号
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -184,6 +184,12 @@ public class WlyyDevice {
        this.applicantMail = applicantMail;
    }
    @Column(name = "sim")
    public String getSim() {
        return sim;
    }
    public void setSim(String sim) {
        this.sim = sim;
    }
}

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

@@ -3,9 +3,7 @@ package com.yihu.wlyy.entity;
import com.fasterxml.jackson.annotation.JsonFormat;
import javax.persistence.*;
import java.sql.Timestamp;
import java.util.Date;
import java.util.Objects;
/**
 * Created by Administrator on 2016/12/7.
@@ -20,6 +18,7 @@ public class WlyyPatientDevice {
    private String categoryCode;
    private String deviceName;
    private String deviceSn;
    private String sim;
    private String userType;
    private String userIdcard;
    private Date czrq;
@@ -44,6 +43,15 @@ public class WlyyPatientDevice {
        this.deviceId = deviceId;
    }
    @Column(name = "sim")
    public String getSim() {
        return sim;
    }
    public void setSim(String sim) {
        this.sim = sim;
    }
    @Column(name = "user")
    public String getUser() {
        return user;

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

@@ -28,6 +28,12 @@
			<input type="text"  id="inp_deviceCode" class="required useTitle ajax f-w240 validate-special-char"  required-title="设备SN码不能为空"  data-attr-scan="deviceCode"/>
		</div>
	</div>
	<div class="m-form-group">
		<label class="label_title" style="width:120px">设备SIM码</label>
		<div class="l-text-wrapper m-form-control">
			<input type="text"  id="inp_sim" class="useTitle ajax f-w240 validate-special-char" data-attr-scan="sim"/>
		</div>
	</div>
	<div class="m-form-group">
		<label class="label_title" style="width:120px">厂家名称</label>
		<div class="l-text-wrapper m-form-control essential">

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

@@ -29,6 +29,7 @@
					$("#inp_deviceName").ligerTextBox({width: 240})//设备名称
					$("#inp_deviceModel").ligerTextBox({width: 240})//设备型号
					$("#inp_deviceCode").ligerTextBox({width: 240})//设备唯一标识
					$("#inp_sim").ligerTextBox({width: 240})//设备sim码
					$("#inp_manufacturer").ligerTextBox({width: 240})//厂家名称
					$("#inp_address").ligerTextBox({width: 240})//厂家地址
					$("#inp_representative").ligerTextBox({width: 240})//法人代表
@@ -41,6 +42,7 @@
							{text: '三诺生物传感股份有限公司', id: 'threeNod'},
							{text: '深圳市优瑞恩科技有限公司', id: 'urion'},
							{text: '爱奥乐医疗器械（深圳）有限公司', id: 'bioland'} ,
							{text: '中兴云湃*脉搏波', id: 'yunpai'} ,
							{text: '康为血糖仪', id: 'comvee'}
						]
					});
@@ -69,6 +71,7 @@
									tel: data.tel,
									serverIp: data.serverIp,
									deviceName: data.deviceName,
									sim: data.sim,
									deviceModel: data.deviceModel,
									address: data.address,
									representative: data.representative,

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

@@ -68,8 +68,9 @@
							{display: 'ID', name: 'id', hide: true},
							{display: '设备名称', name: 'deviceName', width: '10%', align: "left"},
							{display: '型号', name: 'deviceModel', width: '10%', align: "left"},
							{display: 'SN码', name: 'deviceCode', width: '15%', align: "left"},
							{display: '机构名称', name: 'orgName', width: '15%', align: "left"},
							{display: 'SN码', name: 'deviceCode', width: '10%', align: "left"},
							{display: 'SIM码', name: 'sim', width: '10%', align: "left"},
							{display: '机构名称', name: 'orgName', width: '10%', align: "left"},
							{display: '联系人', name: 'linkman', width: '10%', align: "center"},
							{display: '联系电话', name: 'tel', width: '10%', align: "center"},
							//{display: '申请注册人', name: 'applicantName', width: '6%', align: "center"},

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

@@ -36,6 +36,12 @@
			<input type="text"  id="inp_deviceCode" class="required useTitle ajax f-w240 validate-special-char"  required-title="设备SN码不能为空"  data-attr-scan="deviceCode"/>
		</div>
	</div>
	<div class="m-form-group">
		<label class="label_title" style="width:120px">设备SIM码</label>
		<div class="l-text-wrapper m-form-control">
			<input type="text"  id="inp_sim" class="useTitle ajax f-w240 validate-special-char"  data-attr-scan="sim"/>
		</div>
	</div>
	<div class="m-form-group">
		<label class="label_title" style="width:120px">厂家名称</label>
		<div class="l-text-wrapper m-form-control essential">

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

@@ -28,6 +28,7 @@
					$("#inp_deviceName").ligerTextBox({width: 240})//设备名称
					$("#inp_deviceModel").ligerTextBox({width: 240})//设备型号
					$("#inp_deviceCode").ligerTextBox({width: 240})//设备唯一标识
					$("#inp_sim").ligerTextBox({width: 240})//设备sim
					$("#inp_manufacturer").ligerTextBox({width: 240})//厂家名称
					$("#inp_address").ligerTextBox({width: 240})//厂家地址
					$("#inp_representative").ligerTextBox({width: 240})//法人代表
@@ -44,6 +45,7 @@
							{text: '三诺生物传感股份有限公司', id: 'threeNod'},
							{text: '深圳市优瑞恩科技有限公司', id: 'urion'},
							{text: '爱奥乐医疗器械（深圳）有限公司', id: 'bioland'} ,
                            {text: '中兴云湃*脉搏波', id: 'yunpai'} ,
							{text: '康为血糖仪', id: 'comvee'}
						]
					});
@@ -66,6 +68,7 @@
									tel: data.tel,
									serverIp: data.serverIp,
									deviceName: data.deviceName,
									sim: data.sim,
									deviceModel: data.deviceModel,
									deviceCode: data.deviceCode,
									address: data.address,

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

@@ -85,7 +85,8 @@
									return ""
								}
							},
							{display: '设备SN码', name: 'deviceSn', width: '15%', align: "left"},
							{display: '设备SN码', name: 'deviceSn', width: '10%', align: "left"},
							{display: '设备sim码', name: 'sim', width: '10%', align: "left"},
							{display: '居民姓名', name: 'userName', width: '10%', align: "center"},
							{
								display: '绑定按键', name: 'userType', width: '10%', align: "center",
@@ -103,7 +104,7 @@
								}
							},
							{display: '身份证号', name: 'userIdcard', width: '15%', align: "center"},
							{display: '创建日期', name: 'czrq', width: '15%', align: "center"},
							{display: '创建日期', name: 'czrq', width: '10%', align: "center"},
							{
								display: '操作', name: 'operator', width: '10%', align: "center", isSort: false,
								render: function (row) {