Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepairGoods.java
===================================================================
diff -u -r41126 -r41550
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepairGoods.java	(.../InstrumentRepairGoods.java)	(revision 41126)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepairGoods.java	(.../InstrumentRepairGoods.java)	(revision 41550)
@@ -7,6 +7,7 @@
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
+import javax.persistence.Transient;
 
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -85,7 +86,30 @@
 	 * ZSYKEQ-38
 	 */
 	private String instrumentSerialNumber;
-
+	
+	
+	/**
+	 * 器械类型id
+	 */
+	private Long deviceTypeHttpOptionId;
+	/**
+	 * 器械类型
+	 * 不保存到数据库
+	 */
+	private String deviceType;
+	/**
+	 * 故障部位
+	 * 不保存到数据库
+	 */
+	private String faultLocation;
+	/**
+	 * 故障部位id
+	 */
+	private Long faultLocationHttpOptionId;
+	/**
+	 * 器械厂家
+	 */
+	private String manufacturer;
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	public Long getId() {
@@ -180,5 +204,45 @@
 	public void setInstrumentSerialNumber(String instrumentSerialNumber) {
 		this.instrumentSerialNumber = instrumentSerialNumber;
 	}
+	@Transient
+	public String getDeviceType() {
+		return deviceType;
+	}
 
+	public void setDeviceType(String deviceType) {
+		this.deviceType = deviceType;
+	}
+	@Transient
+	public String getFaultLocation() {
+		return faultLocation;
+	}
+
+	public void setFaultLocation(String faultLocation) {
+		this.faultLocation = faultLocation;
+	}
+
+	public Long getDeviceTypeHttpOptionId() {
+		return deviceTypeHttpOptionId;
+	}
+
+	public void setDeviceTypeHttpOptionId(Long deviceTypeHttpOptionId) {
+		this.deviceTypeHttpOptionId = deviceTypeHttpOptionId;
+	}
+
+	public Long getFaultLocationHttpOptionId() {
+		return faultLocationHttpOptionId;
+	}
+
+	public void setFaultLocationHttpOptionId(Long faultLocationHttpOptionId) {
+		this.faultLocationHttpOptionId = faultLocationHttpOptionId;
+	}
+
+	public String getManufacturer() {
+		return manufacturer;
+	}
+
+	public void setManufacturer(String manufacturer) {
+		this.manufacturer = manufacturer;
+	}
+
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepair.java
===================================================================
diff -u -r41126 -r41550
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepair.java	(.../InstrumentRepair.java)	(revision 41126)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/instrumentrepair/InstrumentRepair.java	(.../InstrumentRepair.java)	(revision 41550)
@@ -72,27 +72,31 @@
 	private Date registerDateTime;
 	
 	/**
-	 * 房间号
+	 * 房间号 术间号
 	 */
 	private String roomNumber;
 	
 	/**
 	 * 洗手护士ID（发现故障）
+	 * 发现者 发现人id
 	 */
 	private Long washHandNurseID;
 	
 	/**
 	 * 洗手护士姓名（发现故障）
+	 * 发现者 发现人
 	 */
 	private String washHandNurseName;
 	
 	/**
 	 * 送修护士ID
+	 * 送修者 送修人id
 	 */
 	private Long repairNurseID;
 	
 	/**
 	 * 送修护士
+	 * 送修者 送修人
 	 */
 	private String repairNurseName;
 	
@@ -338,6 +342,15 @@
 	 */
 	private Double repairPrice;
 	
+	/**
+	 * 发现环节
+	 */
+	private String discoveryPhase;
+	/**
+	 * 发现环节id
+	 */
+	private Long discoveryPhaseOptionId;
+	
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	public Long getId() {
@@ -798,7 +811,22 @@
 	public void setEngineerPhoneNumber(String engineerPhoneNumber) {
 		this.engineerPhoneNumber = engineerPhoneNumber;
 	}
+	@Transient
+	public String getDiscoveryPhase() {
+		return discoveryPhase;
+	}
 
+	public void setDiscoveryPhase(String discoveryPhase) {
+		this.discoveryPhase = discoveryPhase;
+	}
+
+	public Long getDiscoveryPhaseOptionId() {
+		return discoveryPhaseOptionId;
+	}
+
+	public void setDiscoveryPhaseOptionId(Long discoveryPhaseOptionId) {
+		this.discoveryPhaseOptionId = discoveryPhaseOptionId;
+	}
 	/**
 	 * CDSLQYQYYY-118新增可提醒用户的器械维修记录版本
 	 * 在此版本中，此字段的根据以下规则来取值：