Просмотр исходного кода

ai病例质控后台维护修改3

wangfeng 5 лет назад
Родитель
Сommit
b279f40182

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

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.GetUpdateInfoDTO;
 import com.diagbot.dto.GetUpdateInfoDetialDTO;
@@ -8,6 +9,7 @@ import com.diagbot.dto.QcCasesEntryAllDTO;
 import com.diagbot.dto.QcHospitalInfoAllDTO;
 import com.diagbot.entity.CasesEntryHospital;
 import com.diagbot.entity.QcCasesEntry;
+import com.diagbot.entity.QcInputcasesMapping;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.QcCasesEntryServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -88,14 +90,31 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
      * @return
      */
     public Boolean deleteQcCasesEntry(GetUpdateInfoVO getUpdateInfoVO){
-        //删除条目
+       /* //删除条目
         QueryWrapper<QcCasesEntry> qcCasesEntryQueryWrapper = new QueryWrapper<>();
         qcCasesEntryQueryWrapper.eq("id",getUpdateInfoVO.getId());
         this.remove(qcCasesEntryQueryWrapper);
         //删除明细
         QueryWrapper<CasesEntryHospital> casesEntryHospitalQueryWrapper = new QueryWrapper<>();
         qcCasesEntryQueryWrapper.eq("cases_entry_id",getUpdateInfoVO.getId());
-        casesEntryHospitalFacade.remove(casesEntryHospitalQueryWrapper);
-        return true;
+        casesEntryHospitalFacade.remove(casesEntryHospitalQueryWrapper);*/
+        //优化后
+        boolean res = false;
+        UpdateWrapper<QcCasesEntry> qcCasesEntryQueryUpdate = new UpdateWrapper<>();
+        qcCasesEntryQueryUpdate
+                .eq("is_deleted",IsDeleteEnum.N.getKey())
+                .eq("id",getUpdateInfoVO.getId())
+                .set("is_deleted",IsDeleteEnum.Y.getKey());
+        res = update(qcCasesEntryQueryUpdate);
+        if (res) {
+            UpdateWrapper<CasesEntryHospital> qcHospitalUpdate = new UpdateWrapper<>();
+            qcHospitalUpdate
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("cases_entry_id",getUpdateInfoVO.getId())
+                    .set("is_deleted", IsDeleteEnum.Y.getKey());
+            res = casesEntryHospitalFacade.update(qcHospitalUpdate);
+        }
+        return res;
+
     }
 }

+ 3 - 3
mrman-service/src/main/java/com/diagbot/facade/QcCasesFacade.java

@@ -49,9 +49,9 @@ public class QcCasesFacade extends QcCasesServiceImpl {
         qcCasesEntryQuery
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .orderByDesc("order_no");
-        List<QcCasesEntry> dataEntry = qcCasesEntryService.list(qcCasesEntryQuery);
-        List<QcCasesEntryDTO> dataEntryDTO = new ArrayList<>();
-        dataEntryDTO = BeanUtil.listCopyTo(dataEntry,QcCasesEntryDTO.class);
+        List<QcCasesEntryDTO> dataEntryDTO = qcCasesEntryService.getQcCasesEntryAll();
+        /*List<QcCasesEntryDTO> dataEntryDTO = new ArrayList<>();
+        dataEntryDTO = BeanUtil.listCopyTo(dataEntry,QcCasesEntryDTO.class);*/
        // 然后把所有病例类型放进去
         Map<Long, List<QcCasesEntryDTO>> map
                 = EntityUtil.makeEntityListMap(dataEntryDTO, "casesId");

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

@@ -29,4 +29,6 @@ public interface QcCasesEntryMapper extends BaseMapper<QcCasesEntry> {
     IPage<QcCasesEntryAllDTO> getAllQcCasesEntry(QcCasesEntryAllVO qcCasesEntryAllVO);
 
     List<QcCasesEntryDTO> getByCasesEntryId( @Param("ids") List<Long> ids);
+
+    List<QcCasesEntryDTO> getQcCasesEntryAll();
 }

+ 2 - 0
mrman-service/src/main/java/com/diagbot/service/QcCasesEntryService.java

@@ -29,4 +29,6 @@ public interface QcCasesEntryService extends IService<QcCasesEntry> {
     IPage<QcCasesEntryAllDTO> getAllQcCasesEntry(QcCasesEntryAllVO qcCasesEntryAllVO);
 
     List<QcCasesEntryDTO> getByCasesEntryId(List<Long> ids);
+
+    List<QcCasesEntryDTO> getQcCasesEntryAll();
 }

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

@@ -32,4 +32,9 @@ public class QcCasesEntryServiceImpl extends ServiceImpl<QcCasesEntryMapper, QcC
     public List<QcCasesEntryDTO> getByCasesEntryId(List<Long> ids) {
         return baseMapper.getByCasesEntryId(ids);
     }
+
+    @Override
+    public List<QcCasesEntryDTO> getQcCasesEntryAll() {
+        return baseMapper.getQcCasesEntryAll();
+    }
 }

+ 1 - 0
mrman-service/src/main/java/com/diagbot/vo/GetUpdateInfoVO.java

@@ -12,4 +12,5 @@ import lombok.Setter;
 @Setter
 public class GetUpdateInfoVO {
     private Long id;
+
 }

+ 1 - 1
mrman-service/src/main/java/com/diagbot/vo/InsertByHospitalVO.java

@@ -53,7 +53,7 @@ public class InsertByHospitalVO {
 
     private String precond;
 
-    private Integer modeId;
+    private Long modeId;
 
     /**
      * 备注

+ 6 - 0
mrman-service/src/main/resources/mapper/QcCasesEntryMapper.xml

@@ -47,4 +47,10 @@
             #{ids}
         </foreach>
     </select>
+    <select id ="getQcCasesEntryAll" resultType="com.diagbot.dto.QcCasesEntryAllDTO">
+        SELECT a.*,b.name as modeName FROM qc_cases_entry a
+        LEFT JOIN  qc_mode b ON b.id= a.mode_id
+        WHERE a.is_deleted = 'N'
+        ORDER BY a.cases_id,a.id
+    </select>
 </mapper>