增加模板性別字段

icss-service/src/main/java/com/diagbot/dto/TemplateInfoDTO.java

@@ -21,6 +21,7 @@ public class TemplateInfoDTO {
 	 private Long doctorId;//医生id
 	 private Long hospitalId;//医院id
 	 private Long hospitalDeptId;//部门id
+	 private Integer sex;//性别
 	 private String type;//模板类型
 	 private String  preview;//预览文字
 	 private String dataJson;//模板数据

icss-service/src/main/java/com/diagbot/entity/TemplateInfo.java

@@ -71,6 +71,10 @@ public class TemplateInfo implements Serializable {
      */
     private Long hospitalId;
 
+    /**
+     * 性别
+     */
+    private Integer sex;
     /**
      * 分类(1:结构化模板,2:文本输入模板)
      */
@@ -163,7 +167,16 @@ public class TemplateInfo implements Serializable {
     public void setHospitalId(Long hospitalId) {
         this.hospitalId = hospitalId;
     }
-    public String getType() {
+    
+    public Integer getSex() {
+		return sex;
+	}
+
+	public void setSex(Integer sex) {
+		this.sex = sex;
+	}
+
+	public String getType() {
         return type;
     }
 
@@ -205,6 +218,7 @@ public class TemplateInfo implements Serializable {
         ", doctorId=" + doctorId +
         ", hospitalDeptId=" + hospitalDeptId +
         ", hospitalId=" + hospitalId +
+        ", sex" + sex +
         ", type=" + type +
         ", preview=" + preview +
         ", dataJson=" + dataJson +

icss-service/src/main/java/com/diagbot/facade/TemplateInfoFacade.java

@@ -44,7 +44,11 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         mapAll.put("hospital_id", templateInfoVO.getHospitalId());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         mapAll.put("type", templateInfoVO.getType());
-        templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
+        if(templateInfoVO.getSex()!=null){
+        	templateInfoQuery.allEq(mapAll).in("sex", 3,templateInfoVO.getSex()).orderByDesc("gmt_create");
+        }else {
+        	templateInfoQuery.allEq(mapAll).orderByDesc("gmt_create");
+		} 
         List<TemplateInfoDTO> data = new ArrayList<TemplateInfoDTO>();
         List<TemplateInfo> datas = list(templateInfoQuery);
 		//过滤
@@ -124,6 +128,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         templateInfo.setGmtCreate(DateUtil.now());//创建时间
         templateInfo.setHospitalDeptId(templateInfosVO.getHospitalDeptId());//部门id
         templateInfo.setHospitalId(templateInfosVO.getHospitalId());//医院id
+        templateInfo.setSex(templateInfosVO.getSex());
         templateInfo.setPreview(GsonUtil.toJson(templateInfosVO.getPreview()));//文本的展示
         templateInfo.setDataJson(templateInfosVO.getDataJson());//页面json
         templateInfo.setName(templateInfosVO.getModeName());//模板名称

icss-service/src/main/java/com/diagbot/vo/TemplateInfoVO.java

@@ -29,4 +29,6 @@ public class TemplateInfoVO {
 	
 	@NotBlank(message = "请输入模板类型")
 	private String type;//模板类型
+	
+	private Integer sex;//性别
 }

icss-service/src/main/java/com/diagbot/vo/TemplateInfosVO.java

@@ -23,6 +23,8 @@ public class TemplateInfosVO {
 	private Long hospitalId;//医院id
 	@NotNull(message = "请输入部门id")
 	private Long hospitalDeptId;//部门id
+	@NotNull(message = "请输入性别")
+	private Integer sex;//性别
 	@NotBlank(message = "请输入模板类型")
 	private String modeType;//模板类型
 	@NotNull(message = "请输入预览文本")

icss-service/src/main/resources/mapper/TemplateInfoMapper.xml

@@ -14,6 +14,7 @@
         <result column="doctor_id" property="doctorId" />
         <result column="hospital_dept_id" property="hospitalDeptId" />
         <result column="hospital_id" property="hospitalId" />
+        <result column="sex" property="sex" />
         <result column="type" property="type" />
         <result column="preview" property="preview" />
         <result column="data_json" property="dataJson" />