接口更改

mrman-service/src/main/java/com/diagbot/dto/QcCasesEntrySimpleDTO.java

@@ -25,4 +25,9 @@ public class QcCasesEntrySimpleDTO {
      * 0-未启用 1-启用
      */
     private String isUsed;
+
+    /**
+     * modeName
+     */
+    private String modeName;
 }

mrman-service/src/main/java/com/diagbot/dto/QcTypeDTO.java

@@ -4,6 +4,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -20,5 +21,5 @@ public class QcTypeDTO {
     // 质控类型名称
     private String name;
     // 质控类型和质控条目对应关系
-    private List<QcCasesEntrySimpleDTO> qcCasesEntrySimpleDTOList;
+    private Map<String, List<QcCasesEntrySimpleDTO>> entryMap;
 }

mrman-service/src/main/java/com/diagbot/facade/QcCacesEntryFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.GetUpdateInfoDTO;
 import com.diagbot.dto.GetUpdateInfoDetialDTO;
 import com.diagbot.dto.QcCasesEntryAllDTO;
+import com.diagbot.dto.QcCasesEntrySimpleDTO;
 import com.diagbot.dto.QcHospitalInfoAllDTO;
 import com.diagbot.entity.CasesEntryHospital;
 import com.diagbot.entity.QcCasesEntry;
@@ -17,6 +18,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.GetUpdateInfoVO;
 import com.diagbot.vo.QcCasesEntryAllVO;
 import com.diagbot.vo.QcCasesEntryIndexVO;
+import com.diagbot.vo.QcEntryHospitalVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -128,4 +130,8 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
         return res;
 
     }
+
+    public List<QcCasesEntrySimpleDTO> getEntryByHospitalFac(QcEntryHospitalVO qcEntryHospitalVO) {
+        return this.getEntryByHospital(qcEntryHospitalVO);
+    }
 }

mrman-service/src/main/java/com/diagbot/facade/QcTypeFacade.java

@@ -18,9 +18,11 @@ import com.diagbot.service.QcTypeCasesEntryService;
 import com.diagbot.service.impl.QcTypeServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
+import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.DeleteQcTypeVO;
+import com.diagbot.vo.QcEntryHospitalVO;
 import com.diagbot.vo.QcTypeCasesEntryVO;
 import com.diagbot.vo.QcTypeIndexVO;
 import com.diagbot.vo.QcTypePageVO;
@@ -29,10 +31,12 @@ import com.diagbot.vo.QcTypeVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description:
@@ -172,6 +176,17 @@ public class QcTypeFacade extends QcTypeServiceImpl {
         return res;
     }
 
+    /**
+     * 新增时质控条目分组信息
+     *
+     * @param qcEntryHospitalVO
+     * @return
+     */
+    public Map<String, List<QcCasesEntrySimpleDTO>> getEntryByHospital(@RequestBody QcEntryHospitalVO qcEntryHospitalVO) {
+        List<QcCasesEntrySimpleDTO> qcCasesEntrySimpleDTOList = qcCacesEntryFacade.getEntryByHospitalFac(qcEntryHospitalVO);
+        return EntityUtil.makeEntityListMap(qcCasesEntrySimpleDTOList, "modeName");
+    }
+
     /**
      * 检索
      *
@@ -201,7 +216,8 @@ public class QcTypeFacade extends QcTypeServiceImpl {
         }
         BeanUtil.copyProperties(qcType, qcTypeDTO);
         List<QcCasesEntrySimpleDTO> list = qcTypeCasesEntryFacade.getByTypeIdFac(qcTypeVO);
-        qcTypeDTO.setQcCasesEntrySimpleDTOList(list);
+        Map<String, List<QcCasesEntrySimpleDTO>> entryMap = EntityUtil.makeEntityListMap(list, "modeName");
+        qcTypeDTO.setEntryMap(entryMap);
         return qcTypeDTO;
     }
 

mrman-service/src/main/java/com/diagbot/mapper/QcCasesEntryMapper.java

@@ -8,6 +8,7 @@ import com.diagbot.dto.QcCasesEntrySimpleDTO;
 import com.diagbot.entity.QcCasesEntry;
 import com.diagbot.vo.QcCasesEntryAllVO;
 import com.diagbot.vo.QcCasesEntryIndexVO;
+import com.diagbot.vo.QcEntryHospitalVO;
 import com.diagbot.vo.QcTypeIndexVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -38,4 +39,6 @@ public interface QcCasesEntryMapper extends BaseMapper<QcCasesEntry> {
     List<QcCasesEntryDTO> getQcCasesEntryAll();
 
     public List<QcCasesEntrySimpleDTO> index(QcTypeIndexVO qcTypeIndexVO);
+
+    public List<QcCasesEntrySimpleDTO> getEntryByHospital(QcEntryHospitalVO qcEntryHospitalVO);
 }

mrman-service/src/main/java/com/diagbot/service/QcCasesEntryService.java

@@ -8,6 +8,7 @@ import com.diagbot.dto.QcCasesEntrySimpleDTO;
 import com.diagbot.entity.QcCasesEntry;
 import com.diagbot.vo.QcCasesEntryAllVO;
 import com.diagbot.vo.QcCasesEntryIndexVO;
+import com.diagbot.vo.QcEntryHospitalVO;
 import com.diagbot.vo.QcTypeIndexVO;
 
 import java.util.List;
@@ -38,4 +39,6 @@ public interface QcCasesEntryService extends IService<QcCasesEntry> {
     List<QcCasesEntryDTO> getQcCasesEntryAll();
 
     public List<QcCasesEntrySimpleDTO> index(QcTypeIndexVO qcTypeIndexVO);
+
+    public List<QcCasesEntrySimpleDTO> getEntryByHospital(QcEntryHospitalVO qcEntryHospitalVO);
 }

mrman-service/src/main/java/com/diagbot/service/impl/QcCasesEntryServiceImpl.java

@@ -10,6 +10,7 @@ import com.diagbot.mapper.QcCasesEntryMapper;
 import com.diagbot.service.QcCasesEntryService;
 import com.diagbot.vo.QcCasesEntryAllVO;
 import com.diagbot.vo.QcCasesEntryIndexVO;
+import com.diagbot.vo.QcEntryHospitalVO;
 import com.diagbot.vo.QcTypeIndexVO;
 import org.springframework.stereotype.Service;
 
@@ -50,4 +51,9 @@ public class QcCasesEntryServiceImpl extends ServiceImpl<QcCasesEntryMapper, QcC
     public List<QcCasesEntrySimpleDTO> index(QcTypeIndexVO qcTypeIndexVO) {
         return baseMapper.index(qcTypeIndexVO);
     }
+
+    @Override
+    public List<QcCasesEntrySimpleDTO> getEntryByHospital(QcEntryHospitalVO qcEntryHospitalVO) {
+        return baseMapper.getEntryByHospital(qcEntryHospitalVO);
+    }
 }

mrman-service/src/main/java/com/diagbot/vo/QcEntryHospitalVO.java

@@ -0,0 +1,16 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhoutg
+ * @time: 2018/11/29 15:09
+ */
+@Getter
+@Setter
+public class QcEntryHospitalVO {
+    // 医院id
+    private Long hospitalId;
+}

mrman-service/src/main/java/com/diagbot/web/QcTypeController.java

@@ -9,6 +9,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.QcQuestionInfo;
 import com.diagbot.facade.QcTypeFacade;
 import com.diagbot.vo.DeleteQcTypeVO;
+import com.diagbot.vo.QcEntryHospitalVO;
 import com.diagbot.vo.QcTypeIndexVO;
 import com.diagbot.vo.QcTypePageVO;
 import com.diagbot.vo.QcTypeSaveVO;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -64,6 +66,15 @@ public class QcTypeController {
         return RespDTO.onSuc(data);
     }
 
+    @ApiOperation(value = "新增时质控条目分组信息[by:zhoutg]",
+            notes = "")
+    @PostMapping("/getEntryByHospital")
+    @SysLogger("getEntryByHospital")
+    public RespDTO<Map<String, List<QcCasesEntrySimpleDTO>>> getEntryByHospital(@RequestBody QcEntryHospitalVO qcEntryHospitalVO) {
+        Map<String, List<QcCasesEntrySimpleDTO>> data = qcTypeFacade.getEntryByHospital(qcEntryHospitalVO);
+        return RespDTO.onSuc(data);
+    }
+
     @ApiOperation(value = "质控条目检索[by:zhoutg]",
             notes = "    // 界面输入\n" +
                     "     String input;\n" +

mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -127,4 +127,22 @@
         </if>
         order by t2.order_no
     </select>
+    
+    <select id="getEntryByHospital" resultType="com.diagbot.dto.QcCasesEntrySimpleDTO">
+        SELECT
+            t1.`name`, t1.id, t3.`name` mode_name
+        FROM
+            qc_cases_entry t1,
+            qc_cases_entry_hospital t2,
+            qc_mode t3
+        WHERE
+            t1.is_deleted = 'N'
+        AND t2.is_deleted = 'N'
+        AND t3.is_deleted = 'N'
+        AND t1.id = t2.cases_entry_id
+        AND t2.is_used = 1
+        AND t1.mode_id = t3.id
+        AND t2.hospital_id = #{hospitalId}
+        ORDER BY t3.order_no,t1.order_no
+    </select>
 </mapper>

mrman-service/src/main/resources/mapper/QcTypeCasesEntryMapper.xml

@@ -17,23 +17,26 @@
 
     <select id="getByTypeId" resultType="com.diagbot.dto.QcCasesEntrySimpleDTO">
         SELECT
-            t3.msg NAME, t3.is_used, t2.id
+            t2.id, t2.name, t3.is_used, t5.name mode_name
         FROM
             qc_type_cases_entry t1,
             qc_cases_entry t2,
             qc_cases_entry_hospital t3,
-            qc_type t4
+            qc_type t4,
+						qc_mode t5
         WHERE
             t1.is_deleted = 'N'
         AND t2.is_deleted = 'N'
         AND t3.is_deleted = 'N'
         AND t4.is_deleted = 'N'
+        AND t5.is_deleted = 'N'
         AND t1.case_entry_id = t2.id
         AND t2.id = t3.cases_entry_id
         AND t3.hospital_id = t4.hospital_id
         AND t1.type_id = t4.id
+		AND t2.mode_id = t5.id
         AND t4.id = #{id}
-        ORDER BY t1.id
+        ORDER BY t5.order_no, t2.order_no
     </select>
 
 </mapper>