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

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

@@ -1,17 +1,5 @@
 package com.diagbot.facade;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.ItemIndexDTO;
@@ -19,15 +7,24 @@ import com.diagbot.entity.IndexData;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.IndexDataService;
 import com.diagbot.service.impl.IndexDataServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.IndexDataVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年3月11日 下午4:20:33
@@ -35,98 +32,96 @@ import com.diagbot.vo.IndexDataVO;
 @Component
 public class IndexDataFacade extends IndexDataServiceImpl {
 
-	@Autowired
-	IndexDataService indexDataService;
-	@Autowired
-	IndexConfigFacade indexConfigFacade;
+    @Autowired
+    IndexConfigFacade indexConfigFacade;
+
+    /**
+     * 根据疾病id和用户id，开始时间和结束时间 查询用户指标数据
+     *
+     * @param indexDataFindVO
+     * @return
+     */
+    public List<ItemIndexDTO> getIndexDataAll(IndexDataFindVO indexDataFindVO) {
 
-	/**
-	 * 根据疾病id和用户id，开始时间和结束时间 查询用户指标数据
-	 * 
-	 * @param indexDataAllVO
-	 * @return
-	 */
-	public List<ItemIndexDTO> getIndexDataAll(IndexDataFindVO indexDataFindVO) {
+        Map<String, Object> indexDataMap = new HashMap<>();
+        indexDataMap.put("diseaseId", indexDataFindVO.getDiseaseId());
+        indexDataMap.put("patientId", indexDataFindVO.getPatientId());
+        indexDataMap.put("startTime", indexDataFindVO.getStartTime());
+        indexDataMap.put("endTime", indexDataFindVO.getEndTime());
+        //获取慢病指标数据
+        List<IndexDataDTO> data = this.getIndexDataAll(indexDataMap);
+        List<ItemIndexDTO> list = new ArrayList<ItemIndexDTO>();
+        // 根据公表名分组
+        Map<String, List<IndexDataDTO>> dataMap = data.stream()
+                .collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
 
-		Map<String, Object> indexDataMap = new HashMap<>();
-		indexDataMap.put("diseaseId", indexDataFindVO.getDiseaseId());
-		indexDataMap.put("patientId", indexDataFindVO.getPatientId());
-		indexDataMap.put("startTime", indexDataFindVO.getStartTime());
-		indexDataMap.put("endTime", indexDataFindVO.getEndTime());
-		//获取慢病指标数据
-		List<IndexDataDTO> data = indexDataService.getIndexDataAll(indexDataMap);
-		List<ItemIndexDTO> list = new ArrayList<ItemIndexDTO>();
-		// 根据公表名分组
-		Map<String, List<IndexDataDTO>> dataMap = data.stream()
-				.collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
+        for (String key : dataMap.keySet()) {
+            ItemIndexDTO itemIndexDTO = new ItemIndexDTO();
+            itemIndexDTO.setItemName(key);
+            List<String> indexUnits = new ArrayList<String>();
+            List<String> indexValues = new ArrayList<String>();
+            List<Integer> isAbnormals = new ArrayList<Integer>();
+            List<Date> creatTimes = new ArrayList<Date>();
+            List<IndexDataDTO> indexDatas = dataMap.get(key);
+            for (IndexDataDTO indexDataDTO : indexDatas) {
+                indexUnits.add(indexDataDTO.getIndexUnit());
+                indexValues.add(indexDataDTO.getIndexValue());
+                isAbnormals.add(indexDataDTO.getIsAbnormal());
+                creatTimes.add(indexDataDTO.getCreatTime());
+            }
+            itemIndexDTO.setIndexUnit(indexUnits);
+            itemIndexDTO.setIndexValue(indexValues);
+            itemIndexDTO.setIsAbnormal(isAbnormals);
+            itemIndexDTO.setCreatTime(creatTimes);
+            list.add(itemIndexDTO);
 
-		for (String key : dataMap.keySet()) {
-			ItemIndexDTO itemIndexDTO = new ItemIndexDTO();
-			itemIndexDTO.setItemName(key);
-			List<String> indexUnits = new ArrayList<String>();
-			List<String> indexValues = new ArrayList<String>();
-			List<Integer> isAbnormals = new ArrayList<Integer>();
-			List<Date> creatTimes = new ArrayList<Date>();
-			List<IndexDataDTO> indexDatas = dataMap.get(key);
-			for (IndexDataDTO indexDataDTO : indexDatas) {
-				indexUnits.add(indexDataDTO.getIndexUnit());
-				indexValues.add(indexDataDTO.getIndexValue());
-				isAbnormals.add(indexDataDTO.getIsAbnormal());
-				creatTimes.add(indexDataDTO.getCreatTime());
-			}
-			itemIndexDTO.setIndexUnit(indexUnits);
-			itemIndexDTO.setIndexValue(indexValues);
-			itemIndexDTO.setIsAbnormal(isAbnormals);
-			itemIndexDTO.setCreatTime(creatTimes);
-			list.add(itemIndexDTO);
+        }
+        return list;
+    }
 
-		}
-		return list;
-	}
+    /**
+     * 保存指标数据
+     *
+     * @param indexDataSaveVO
+     * @return
+     */
+    public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
+        // 先查询该用户相同就诊号所保留的数据，将其删除
+        UpdateWrapper<IndexData> IndexDataUpdate = new UpdateWrapper<>();
+        Map<String, Object> mapAll = new HashMap<>();
+        mapAll.put("inquiry_code", indexDataSaveVO.getInquiryCode());
+        mapAll.put("patient_id", indexDataSaveVO.getPatientId());
+        IndexDataUpdate.allEq(mapAll).eq("is_deleted", IsDeleteEnum.N.getKey())
+                .set("is_deleted", IsDeleteEnum.Y.getKey())
+                // .set("modifier",UserUtils.getCurrentPrincipleID())
+                .set("gmt_modified", DateUtil.now());
+        boolean res = update(new IndexData(), IndexDataUpdate);
 
-	/**
-	 * 保存指标数据
-	 * 
-	 * @param indexDataSaveVO
-	 * @return
-	 */
-	public boolean saveIndexDatas(IndexDataSaveVO indexDataSaveVO) {
-		// 先查询该用户相同就诊号所保留的数据，将其删除
-		UpdateWrapper<IndexData> IndexDataUpdate = new UpdateWrapper<>();
-		Map<String, Object> mapAll = new HashMap<>();
-		mapAll.put("inquiry_code", indexDataSaveVO.getInquiryCode());
-		mapAll.put("patient_id", indexDataSaveVO.getPatientId());
-		IndexDataUpdate.allEq(mapAll).eq("is_deleted", IsDeleteEnum.N.getKey())
-				.set("is_deleted", IsDeleteEnum.Y.getKey())
-				// .set("modifier",UserUtils.getCurrentPrincipleID())
-				.set("gmt_modified", DateUtil.now());
-		boolean res = update(new IndexData(), IndexDataUpdate);
+        // 遍历数据进行保存
+        List<IndexData> IndexDataList = new ArrayList<IndexData>();
+        List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for (IndexDataVO indexDataNew : indexDatas) {
+            IndexData indexData = new IndexData();
+            indexData.setCreator(indexDataSaveVO.getDoctorId().toString());
+            indexData.setGmtCreate(DateUtil.now());
+            indexData.setIndexUnique(indexDataNew.getIndexUnique());
+            try {
+                indexData.setCreatTime(sdf.parse(indexDataNew.getCreatTime()));
+            } catch (ParseException e) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
+            }
+            indexData.setIndexUnit(indexDataNew.getIndexUnit());
+            indexData.setIndexValue(indexDataNew.getIndexValue());
+            indexData.setInquiryCode(indexDataSaveVO.getInquiryCode());
+            indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
+            indexData.setPatientId(indexDataSaveVO.getPatientId());
+            IndexDataList.add(indexData);
+        }
 
-		// 遍历数据进行保存
-		List<IndexData> IndexDataList = new ArrayList<IndexData>();
-		List<IndexDataVO> indexDatas = indexDataSaveVO.getIndexData();
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		for (IndexDataVO indexDataNew : indexDatas) {
-			IndexData indexData = new IndexData();
-			indexData.setCreator(indexDataSaveVO.getDoctorId().toString());
-			indexData.setGmtCreate(DateUtil.now());
-			indexData.setIndexUnique(indexDataNew.getIndexUnique());
-			try {
-				indexData.setCreatTime(sdf.parse(indexDataNew.getCreatTime()));
-			} catch (ParseException e) {
-				throw new CommonException(CommonErrorCode.NOT_EXISTS, "时间格式有误");
-			}
-			indexData.setIndexUnit(indexDataNew.getIndexUnit());
-			indexData.setIndexValue(indexDataNew.getIndexValue());
-			indexData.setInquiryCode(indexDataSaveVO.getInquiryCode());
-			indexData.setIsAbnormal(indexDataNew.getIsAbnormal());
-			indexData.setPatientId(indexDataSaveVO.getPatientId());
-			IndexDataList.add(indexData);
-		}
+        res = insertIndexDataList(IndexDataList);
 
-		res = insertIndexDataList(IndexDataList);
-		
-		return res;
-	}
+        return res;
+    }
 
 }

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

@@ -46,6 +46,7 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
         //取到所有模板信息
         List<ModuleInfo> list = new ArrayList<>();
         List<Long> ids = new ArrayList<>();
+        Boolean isDefault = false;
         if(moduleVO.getMouduleType().intValue() == 1){
             //根据科室筛选如果没有，返回通用模板
             List<ModuleInfo> moduleInfoByDept = getModuleInfoByDisType(moduleVO.getMouduleType(),moduleVO.getRelationId());
@@ -54,10 +55,7 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
                         .map(moduleInfo -> moduleInfo.getId())
                         .collect(Collectors.toList());
             }else {
-                list = getModuleInfoByDisType(0,0L);
-                ids = list.stream()
-                        .map(moduleInfo -> moduleInfo.getId())
-                        .collect(Collectors.toList());
+                isDefault = true;
             }
         }else if(moduleVO.getMouduleType().intValue() == 2){
             //根据慢病筛选如果没有返回通用模板
@@ -67,16 +65,18 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
                         .map(moduleDeptMapping -> moduleDeptMapping.getId())
                         .collect(Collectors.toList());
             }else {
-                list = getModuleInfoByDisType(0,0L);
-                ids = list.stream()
-                        .map(moduleInfo -> moduleInfo.getId())
-                        .collect(Collectors.toList());
+                isDefault = true;
             }
         }else {
+            isDefault = true;
+        }
+
+        //科室和慢病没有内容，或者默认情况下，需要推测出默认模板
+        if (isDefault){
             //默认
-            list = this.getModuleInfoByDisType(moduleVO.getMouduleType(),moduleVO.getRelationId());
+            list = getModuleInfoByDisType(0,0L);
             ids = list.stream()
-                    .map(artist -> artist.getId())
+                    .map(moduleInfo -> moduleInfo.getId())
                     .collect(Collectors.toList());
         }
         data = BeanUtil.listCopyTo(list, ModuleInfoDTO.class);

icss-service/src/main/java/com/diagbot/mapper/IndexDataMapper.java

@@ -21,6 +21,6 @@ public interface IndexDataMapper extends BaseMapper<IndexData> {
 
 	List<IndexDataDTO> getIndexDataAll( @Param("indexDataMap") Map<String, Object> indexDataMap);
 
-	public boolean insertIndexDataList(List<IndexData> indexDataList);
+	boolean insertIndexDataList(List<IndexData> indexDataList);
 
 }

icss-service/src/main/java/com/diagbot/service/IndexDataService.java

@@ -19,6 +19,6 @@ public interface IndexDataService extends IService<IndexData> {
 
 	List<IndexDataDTO> getIndexDataAll(Map<String, Object> indexDataMap);
 
-	public boolean insertIndexDataList(List<IndexData> IndexDataList);
+	boolean insertIndexDataList(List<IndexData> IndexDataList);
 
 }

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

@@ -46,7 +46,7 @@ public class InquiryInfoController {
     @Autowired
     private InquiryInfoFacade inquiryInfoFacade;
 
-    @ApiOperation(value = "问诊记录保存[by:rengb]")
+    @ApiOperation(value = "2期-问诊记录保存[by:rengb]")
     @PostMapping("/saveInquiry")
     @SysLogger("saveInquiry")
     @Transactional
@@ -54,7 +54,7 @@ public class InquiryInfoController {
         return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
     }
 
-    @ApiOperation(value = "问诊记录回显[by:rengb]")
+    @ApiOperation(value = "2期-问诊记录回显[by:rengb]")
     @PostMapping("/readInquiry")
     @SysLogger("readInquiry")
     public RespDTO<ReadInquiryDTO> readInquiry(@Valid @RequestBody ReadInquiryVO readInquiryVO) {

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

@@ -22,8 +22,9 @@
 
 
     <select id="getDetailByModule" parameterType="java.util.Map" resultMap="BaseResultMap">
-        select  DISTINCT t1.* from
-        icss_module_detail t1 left join icss_question_info t2 on (t1.question_id = t2.id or t1.question_id is null)
+        select t3.* from
+        (select  DISTINCT t1.* from
+        icss_module_detail t1 left join icss_question_info t2 on t1.question_id = t2.id
         where t1.is_deleted = 'N' and t2.is_deleted = 'N'
         and t1.module_id in
         <foreach item="id" collection="ids" open="(" separator="," close=")">
@@ -36,7 +37,14 @@
             <![CDATA[ and t2.age_begin <= #{age} ]]>
             <![CDATA[ and t2.age_end >= #{age} ]]>
         </if>
-        order by t1.module_id, t1.order_no
+        union
+        select  DISTINCT t1.* from
+        icss_module_detail t1 where t1.question_id is null and  t1.is_deleted = 'N'
+        and t1.module_id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>) t3
+        order by t3.module_id, t3.order_no
     </select>
 
 </mapper>

icssman-service/src/main/java/com/diagbot/dto/LisMappingPageDTO.java

@@ -0,0 +1,20 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.LisMapping;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * @Description:化验公表映射出参
+ * @Author:zhaops
+ * @time: 2019/3/26 10:39
+ */
+@Getter
+@Setter
+public class LisMappingPageDTO extends LisMapping {
+    private String operator;
+    private String operatorName;
+    private Date gmtOperate;
+}

icssman-service/src/main/java/com/diagbot/entity/LisMapping.java

@@ -0,0 +1,146 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 化验项目公表映射
+ * </p>
+ *
+ * @author zhaops
+ * @since 2019-03-26
+ */
+@TableName("icss_lis_mapping")
+public class LisMapping implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private LocalDateTime gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private LocalDateTime gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 套餐名
+     */
+    private String mealName;
+
+    /**
+     * 项目名
+     */
+    private String itemName;
+
+    /**
+     * 公表名
+     */
+    private String uniqueName;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public LocalDateTime getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(LocalDateTime gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public LocalDateTime getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(LocalDateTime gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public String getMealName() {
+        return mealName;
+    }
+
+    public void setMealName(String mealName) {
+        this.mealName = mealName;
+    }
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+    public String getUniqueName() {
+        return uniqueName;
+    }
+
+    public void setUniqueName(String uniqueName) {
+        this.uniqueName = uniqueName;
+    }
+
+    @Override
+    public String toString() {
+        return "LisMapping{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", mealName=" + mealName +
+        ", itemName=" + itemName +
+        ", uniqueName=" + uniqueName +
+        "}";
+    }
+}

icssman-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -0,0 +1,14 @@
+package com.diagbot.facade;
+
+import com.diagbot.service.impl.LisMappingServiceImpl;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description:化验项目公表映射业务层
+ * @Author:zhaops
+ * @time: 2019/3/26 9:54
+ */
+@Component
+public class LisMappingFacade extends LisMappingServiceImpl {
+
+}

icssman-service/src/main/java/com/diagbot/mapper/LisMappingMapper.java

@@ -0,0 +1,27 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.LisMappingPageDTO;
+import com.diagbot.entity.LisMapping;
+import com.diagbot.vo.LisMappingPageVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 化验项目公表映射 Mapper 接口
+ * </p>
+ *
+ * @author zhaops
+ * @since 2019-03-26
+ */
+public interface LisMappingMapper extends BaseMapper<LisMapping> {
+
+    /**
+     * 获取化验公表映射分页
+     *
+     * @param lisMappingPageVO
+     * @return
+     */
+    Page<LisMappingPageDTO> lisMappingPage(@Param("lisMappingPageVO") LisMappingPageVO lisMappingPageVO);
+}

icssman-service/src/main/java/com/diagbot/service/LisMappingService.java

@@ -0,0 +1,27 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.LisMappingPageDTO;
+import com.diagbot.entity.LisMapping;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.vo.LisMappingPageVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 化验项目公表映射 服务类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2019-03-26
+ */
+public interface LisMappingService extends IService<LisMapping> {
+
+    /**
+     * 获取化验公表映射分页
+     *
+     * @param lisMappingPageVO
+     * @return
+     */
+    Page<LisMappingPageDTO> lisMappingPage(@Param("lisMappingPageVO") LisMappingPageVO lisMappingPageVO);
+}

icssman-service/src/main/java/com/diagbot/service/impl/LisMappingServiceImpl.java

@@ -0,0 +1,33 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.dto.LisMappingPageDTO;
+import com.diagbot.entity.LisMapping;
+import com.diagbot.mapper.LisMappingMapper;
+import com.diagbot.service.LisMappingService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.vo.LisMappingPageVO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 化验项目公表映射 服务实现类
+ * </p>
+ *
+ * @author zhaops
+ * @since 2019-03-26
+ */
+@Service
+public class LisMappingServiceImpl extends ServiceImpl<LisMappingMapper, LisMapping> implements LisMappingService {
+
+    /**
+     * 获取化验公表映射分页
+     *
+     * @param lisMappingPageVO
+     * @return
+     */
+    public Page<LisMappingPageDTO> lisMappingPage(@Param("lisMappingPageVO") LisMappingPageVO lisMappingPageVO) {
+        return this.baseMapper.lisMappingPage(lisMappingPageVO);
+    }
+}

icssman-service/src/main/java/com/diagbot/vo/LisMappingPageVO.java

@@ -0,0 +1,15 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description: 化验公表映射分页入参
+ * @Author:zhaops
+ * @time: 2019/3/26 10:37
+ */
+@Getter
+@Setter
+public class LisMappingPageVO extends Page {
+}

icssman-service/src/main/java/com/diagbot/web/LisMappingController.java

@@ -0,0 +1,23 @@
+package com.diagbot.web;
+
+
+import com.diagbot.facade.LisMappingFacade;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 化验项目公表映射 前端控制器
+ * </p>
+ *
+ * @author zhaops
+ * @since 2019-03-26
+ */
+@RestController
+@RequestMapping("/lisMapping")
+public class LisMappingController {
+    @Autowired
+    private LisMappingFacade lisMappingFacade;
+
+}

icssman-service/src/main/resources/mapper/LisMappingMapper.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.LisMappingMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.LisMapping">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="meal_name" property="mealName" />
+        <result column="item_name" property="itemName" />
+        <result column="unique_name" property="uniqueName" />
+    </resultMap>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultDTOMap" type="com.diagbot.dto.LisMappingPageDTO">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="meal_name" property="mealName" />
+        <result column="item_name" property="itemName" />
+        <result column="unique_name" property="uniqueName" />
+    </resultMap>
+
+    <!-- 分页查询 -->
+    <select id="lisMappingPage" resultMap="BaseResultDTOMap">
+        SELECT lis.* FROM icss_lis_mapping lis
+        where lis.is_deleted='N'
+        <if test="lisMappingPageVO.mealName != null and lisMappingPageVO.mealName != '' ">
+            and lis.meal_name like concat('%',#{lisMappingPageVO.mealName},'%')
+        </if>
+        <if test="lisMappingPageVO.itemName != null and lisMappingPageVO.itemName != '' ">
+            and lis.item_name like concat('%',#{lisMappingPageVO.itemName},'%')
+        </if>
+        <if test="lisMappingPageVO.uniqueName != null and lisMappingPageVO.uniqueName != '' ">
+            and lis.unique_name like concat('%',#{lisMappingPageVO.uniqueName},'%')
+        </if>
+        order by lis.gmt_modified desc
+    </select>
+
+</mapper>