Merge remote-tracking branch 'origin/dev/icss' into dev/icss

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

@@ -76,6 +76,7 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         mapAll.put("hospital_id", templateInfoRevampVO.getHospitalId());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         mapAll.put("name", templateInfoRevampVO.getModeName());
+        mapAll.put("type", templateInfoRevampVO.getType());
         templates.allEq(mapAll);
         TemplateInfo datas = getOne(templates);
         if (datas != null) {

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

@@ -36,4 +36,6 @@ public class TemplateInfoRevampVO {
 	@NotNull(message = "请输入部门id")
 	private Long hospitalDeptId;//部门id
 	
+	@NotBlank(message = "请输入模板类型")
+	private String type;//模板名
 }