Merge branch 'dev/icss20190903_template' into develop

aipt-service/src/main/java/com/diagbot/web/ConceptDetailController.java

@@ -1,15 +1,11 @@
 package com.diagbot.web;
 
-
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConceptDetailFacade;
-import com.diagbot.util.ParamConvertUtil;
-import com.diagbot.vo.ConceptBaseVO;
 import com.diagbot.vo.ConceptIntroduceVO;
 import com.diagbot.vo.ExistListByConceptIdsVO;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +52,7 @@ public class ConceptDetailController {
     @PostMapping("/exist")
     @SysLogger("exist")
     @ApiIgnore
-    public RespDTO<Bool> exist(@Valid @RequestBody ConceptIntroduceVO conceptIntroduceVO) {
+    public RespDTO<Boolean> exist(@Valid @RequestBody ConceptIntroduceVO conceptIntroduceVO) {
         Boolean data = conceptDetailFacade.exist(conceptIntroduceVO);
         return RespDTO.onSuc(data);
     }

aipt-service/src/main/java/com/diagbot/web/DisTypeController.java

@@ -1,11 +1,9 @@
 package com.diagbot.web;
 
-
 import com.diagbot.dto.DisTypeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DisTypeFacade;
 import com.diagbot.vo.DisTypeVO;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -41,4 +41,6 @@ public class TemplateInfoPageVO extends Page{
 	private String type;//模板类型
 	
 	private List<Integer> sex;//性别
+
+	private String name;//模板名字
 }

icss-service/src/main/java/com/diagbot/web/TemplateInfoController.java

@@ -1,17 +1,5 @@
 package com.diagbot.web;
 
-
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
@@ -25,9 +13,17 @@ import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
 import com.diagbot.vo.TemplateInfosVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+import java.util.List;
 
 /**
  * @author wangfeng
@@ -90,24 +86,29 @@ public class TemplateInfoController {
 
         return RespDTO.onSuc(res);
     }
-    
+
     @ApiOperation(value = "分页查询病历模板列表[by:wangfeng]",
-            notes = "doctorId: 医生id<br>" + "dospitalId：医院编码<br>" + "deptId:部门id<br>" + "type:模式<br> sex：性别")
+            notes = "doctorId: 医生id<br>"
+                    + "dospitalId：医院编码<br>"
+                    + "deptId:部门id<br>"
+                    + "type:模式<br>"
+                    + "sex：性别<br>"
+                    + "name：模板名称")
     @PostMapping("/getTemplatePageAlls")
     @SysLogger("getTemplatePageAlls")
     public RespDTO<IPage<TemplateInfoPageDTO>> getTemplatePageAll(@Valid @RequestBody TemplateInfoPageVO templateInfoPageVO) {
 
-    	IPage<TemplateInfoPageDTO> data = templateInfoFacade.getTemplatePageAlls(templateInfoPageVO,templateInfoPageVO);
+        IPage<TemplateInfoPageDTO> data = templateInfoFacade.getTemplatePageAlls(templateInfoPageVO, templateInfoPageVO);
 
         return RespDTO.onSuc(data);
     }
-    
-    @ApiOperation(value = "根据模板id获取病历模板内容[by:wangfeng]",notes = "id: 请输入模板id")
+
+    @ApiOperation(value = "根据模板id获取病历模板内容[by:wangfeng]", notes = "id: 请输入模板id")
     @PostMapping("/getTemplateIdAlls")
     @SysLogger("getTemplateIdAlls")
     public RespDTO<TemplateInfoDTO> getTemplateIdAll(@Valid @RequestBody TemplateIdVO templateIdVO) {
 
-    	TemplateInfoDTO data = templateInfoFacade.getTemplateIdAlls(templateIdVO);
+        TemplateInfoDTO data = templateInfoFacade.getTemplateIdAlls(templateIdVO);
 
         return RespDTO.onSuc(data);
     }

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

@@ -89,6 +89,9 @@
 		<if test="type != null and type != ''">
 			and type = #{type}
 		</if>
+		<if test="name != null and name != ''">
+			and name like concat('%',#{name},'%')
+		</if>
 		and sex in
 		<foreach collection="sex" item="sexNew" open="(" close=")"
 			separator=",">

tran-service/src/main/java/com/diagbot/web/DataServiceController.java

@@ -4,7 +4,6 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.DataServiceFacade;
 import com.diagbot.vo.HosCodeVO;
-import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;