病例质控指定医院病例条目相关bug修正

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

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetAllByHospitalDTO;
 import com.diagbot.entity.CasesEntryHospital;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.service.CasesEntryHospitalService;
 import com.diagbot.service.impl.CasesEntryHospitalServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.vo.GetAllByHospitalVO;
 import com.diagbot.vo.InsertByHospitalVO;
 import com.diagbot.vo.UpdateByHospitalVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -21,6 +23,8 @@ import java.util.List;
  */
 @Component
 public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
+    @Autowired
+    private CasesEntryHospitalService casesEntryHospitalService;
 
     /**
      * 获取指定医院病例条目
@@ -52,7 +56,7 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
                 .eq("hospital_id",updateByHospitalVO.getHospitalId());
         this.remove(casesEntryHospitalQueryWrapper);
         //添加新的
-        this.saveBatch(updateByHospitalVO.getCasesEntryHospitals());
+        casesEntryHospitalService.saveBatch(updateByHospitalVO.getCasesEntryHospitals());
         return true;
     }
 
@@ -71,7 +75,7 @@ public class CasesEntryHospitalFacade extends CasesEntryHospitalServiceImpl {
             casesEntryHospital.setHospitalId(hospitalId);
             casesEntryHospitals.add(casesEntryHospital);
         }
-        super.saveBatch(casesEntryHospitals);
+        casesEntryHospitalService.saveBatch(casesEntryHospitals);
         return true;
     }
 }

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

@@ -46,7 +46,7 @@ public class QcCacesEntryFacade extends QcCasesEntryServiceImpl {
         }
         List<QcCasesEntry> qcCasesEntryS = this.list(qcCasesEntryQueryWrapper);
         List<QcCasesEntryAllDTO> qcCasesEntryAllDTOS = new ArrayList<>();
-        BeanUtil.copyProperties(qcCasesEntryS,qcCasesEntryAllDTOS);
+        qcCasesEntryAllDTOS = BeanUtil.listCopyTo(qcCasesEntryS,QcCasesEntryAllDTO.class);
         //获取所有模块信息
         QueryWrapper<QcCases> qcCasesQueryWrapper = new QueryWrapper<>();
         qcCasesQueryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());

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

@@ -11,7 +11,9 @@ import com.diagbot.vo.UpdateByHospitalVO;
 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;
 
@@ -36,7 +38,7 @@ public class CasesEntryHospitalController {
             notes = "获取指定医院的病例条目")
     @PostMapping("/getAllByHospital")
     @SysLogger("getAllByHospital")
-    public RespDTO<List<GetAllByHospitalDTO>> getAllByHospital(GetAllByHospitalVO getAllByHospitalVO) {
+    public RespDTO<List<GetAllByHospitalDTO>> getAllByHospital(@RequestBody GetAllByHospitalVO getAllByHospitalVO) {
         List<GetAllByHospitalDTO> data = casesEntryHospitalFacade.getAllByHospital(getAllByHospitalVO);
         return RespDTO.onSuc(data);
     }
@@ -45,7 +47,8 @@ public class CasesEntryHospitalController {
             notes = "修改指定医院的病例条目")
     @PostMapping("/updateByHospital")
     @SysLogger("updateByHospital")
-    public RespDTO<Boolean> updateByHospital(UpdateByHospitalVO updateByHospitalVO) {
+    @Transactional
+    public RespDTO<Boolean> updateByHospital(@RequestBody UpdateByHospitalVO updateByHospitalVO) {
         Boolean data = casesEntryHospitalFacade.updateByHospital(updateByHospitalVO);
         return RespDTO.onSuc(data);
     }
@@ -54,7 +57,8 @@ public class CasesEntryHospitalController {
             notes = "新增指定医院的病例条目")
     @PostMapping("/insertByHospital")
     @SysLogger("insertByHospital")
-    public RespDTO<Boolean> insertByHospital(InsertByHospitalVO insertByHospitalVO) {
+    @Transactional
+    public RespDTO<Boolean> insertByHospital(@RequestBody InsertByHospitalVO insertByHospitalVO) {
         Boolean data = casesEntryHospitalFacade.insertByHospital(insertByHospitalVO);
         return RespDTO.onSuc(data);
     }

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

@@ -10,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
@@ -35,7 +36,7 @@ public class QcCasesEntryController {
             notes = "获取全部条目")
     @PostMapping("/getAll")
     @SysLogger("getAll")
-    public RespDTO<List<QcCasesEntryAllDTO>> getAll(QcCasesEntryAllVO qcCasesEntryAllVO) {
+    public RespDTO<List<QcCasesEntryAllDTO>> getAll(@RequestBody QcCasesEntryAllVO qcCasesEntryAllVO) {
         List<QcCasesEntryAllDTO> data =qcCacesEntryFacade.getAll(qcCasesEntryAllVO);
         return RespDTO.onSuc(data);
     }