Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/RegistrationCertification.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/RegistrationCertification.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/RegistrationCertification.java	(revision 20815)
@@ -0,0 +1,92 @@
+package com.forgon.disinfectsystem.entity.basedatamanager.supplier;
+
+import java.util.Date;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+* @author Liuliben 2017-11-9 下午03:55:28
+*/
+
+@Entity
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+public class RegistrationCertification {
+	
+	/**
+	 * id
+	 */
+	private Long id;
+	
+	/**
+	 * 注册号码
+	 */
+	private String certification;
+	
+	/**
+	 * 有效期
+	 */
+	private Date validityTime;
+   
+	/**
+	 * 类别
+	 */
+	private String type;
+	
+	@JsonIgnore
+	private Supplier supplier;
+	
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public String getCertification() {
+		return certification;
+	}
+
+	public void setCertification(String certification) {
+		this.certification = certification;
+	}
+
+	public Date getValidityTime() {
+		return validityTime;
+	}
+
+	public void setValidityTime(Date validityTime) {
+		this.validityTime = validityTime;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	@ManyToOne
+	@JoinColumn(name = "supplier_id")
+	public Supplier getSupplier() {
+		return supplier;
+	}
+
+	public void setSupplier(Supplier supplier) {
+		this.supplier = supplier;
+	}
+    
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/Supplier.java
===================================================================
diff -u -r12331 -r20815
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/Supplier.java	(.../Supplier.java)	(revision 12331)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplier/Supplier.java	(.../Supplier.java)	(revision 20815)
@@ -1,17 +1,31 @@
 package com.forgon.disinfectsystem.entity.basedatamanager.supplier;
 
+import java.util.ArrayList;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
 import javax.persistence.Table;
 
+import org.hibernate.Query;
+import org.hibernate.Session;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile;
+import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
+import com.forgon.tools.db.DatabaseUtil;
+import com.forgon.tools.hibernate.ObjectDao;
+
 /**
  * @author WangYi 2012-2-15 下午04:55:28
  */
@@ -25,38 +39,67 @@
 	
 	private String guid;
 	
-	//名称
+	/**
+	 * 名称
+	 */
 	private String companyName;
 	
-	//联系人
+	/**
+	 * 联系人
+	 */
 	private String contact;
 	
-	//电话
+	/**
+	 * 电话
+	 */
 	private String phone;
 	
-	//手机
+	/**
+	 * 手机
+	 */
 	private String cellPhone;
 	
-	//邮件
+	/**
+	 * 邮件
+	 */
 	private String email;
 	
-	//地址
+	/**
+	 * 地址
+	 */
 	private String address;
 	
-	private String spelling; // 拼音
+	/**
+	 * 拼音
+	 */
+	private String spelling; 
 
-	private String wbCode;// 五笔
+	/**
+	 * 五笔
+	 */
+	private String wbCode;
 	
 	private String externalCode;
 	
-	//租用器械包
+	/**
+	 * 是否已上传图片
+	 */
+	public String isUploadImage;
+	
+	/**
+	 * 租用器械包
+	 */
 	private String rentTousse;
 	public static final String SUPPLIER_TYPE_RENTTOUSSE = "外来器械租用商";
 	public static final String SUPPLIER_TYPE_MADECOMPANY = "生产厂家";
 	public static final String SUPPLIER_TYPE_SUPPLIER = "供货单位";
+	public static final String SUPPLIER_TYPE_EXPENSIVEGOODSSUPPLIER = "高值耗材供应商 ";
 	
 	public static Map<String,String> ColumnNameAndPoPropertyNameMap= new LinkedHashMap<String,String>(7);
 	
+//	@JsonIgnore
+//	private List<RegistrationCertificate> registrationCertificate = new ArrayList<RegistrationCertificate>();
+	
 	static {
 		ColumnNameAndPoPropertyNameMap.put("公司名称", "companyName");
 		ColumnNameAndPoPropertyNameMap.put("地址", "address");
@@ -66,7 +109,13 @@
 		ColumnNameAndPoPropertyNameMap.put("联系人", "contact");
 		ColumnNameAndPoPropertyNameMap.put("器械包租用", "rentTousse");
 	}
-
+    
+	/**
+	 * 包含的注册证
+	 */
+	@JsonIgnore
+	private List<RegistrationCertification> registrationCertificate = new ArrayList<RegistrationCertification>();
+	
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	public Long getId() {
@@ -165,4 +214,42 @@
 		this.externalCode = externalCode;
 	}
 	
+	public String getIsUploadImage() {		
+		return isUploadImage;
+	}
+
+	public void setIsUploadImage(String isUploadImage) {
+		this.isUploadImage = isUploadImage;
+	}
+	
+	@OneToMany(mappedBy = "supplier", fetch = FetchType.LAZY, cascade = {CascadeType.ALL})
+	public List<RegistrationCertification> getRegistrationCertificate() {
+		return registrationCertificate;
+	}
+
+	public void setRegistrationCertificate(
+			List<RegistrationCertification> registrationCertificate) {
+		this.registrationCertificate = registrationCertificate;
+	}
+
+	public int getImagesCount(ObjectDao objectDao) {
+		String sql = " where po.imageType='" + ImageFile.IMAGE_TYPE_SUPPLIER + "' and po.supplier_id=" + id;
+		int count = objectDao.countObjectBySql(ImageFile.class.getSimpleName(), sql);
+		return count;
+	}
+	
+	public ImageFile getImageAt(ObjectDao objectDao, int index) {
+		
+		Session session = objectDao.getHibernateSession();
+		
+		Query query = session.createQuery("from ImageFile where supplier_id = :id and imageType='供应商图片' order by serialNum asc");
+		query.setLong("id", id);
+		
+		query.setMaxResults(1);
+		query.setFirstResult(index);
+		
+		ImageFile image = (ImageFile)query.uniqueResult();
+		
+		return image;
+	}	
 }