sinake
昨天 be43e890802f764590489d510cfc95f40eba5f47
保存成功返回ID,姓名,上报人模糊查询
已修改9个文件
47 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java
@@ -92,7 +92,11 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDeathinfo serviceDeathinfo) {
        return toAjax(serviceDeathinfoService.save(serviceDeathinfo));
        Boolean result= serviceDeathinfoService.save(serviceDeathinfo);
        if (result) {
            return AjaxResult.success(serviceDeathinfo.getId());
        } else
            return AjaxResult.error();
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java
@@ -92,7 +92,11 @@
    public AjaxResult add(@RequestBody ServiceDonatemaintenanceVO serviceDonatemaintenanceVO) {
        ServiceDonatemaintenanceEntity serviceDonatemaintenance = DtoConversionUtils.sourceToTarget(serviceDonatemaintenanceVO, ServiceDonatemaintenanceEntity.class);
        serviceDonatemaintenance.setItemDesc(serviceDonatemaintenanceVO.getItemDesc().toString());
        return toAjax(serviceDonatemaintenanceService.save(serviceDonatemaintenance));
        boolean result = serviceDonatemaintenanceService.save(serviceDonatemaintenance);
        if (result) {
            return AjaxResult.success(serviceDonatemaintenance.getId());
        } else
            return AjaxResult.error();
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java
@@ -101,7 +101,11 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
        return toAjax(serviceEthicalreviewinitiateService.save(serviceEthicalreviewinitiate));
       boolean result=serviceEthicalreviewinitiateService.save(serviceEthicalreviewinitiate);
        if (result) {
            return AjaxResult.success(serviceEthicalreviewinitiate.getId());
        } else
            return AjaxResult.error();
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -112,7 +112,7 @@
//    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    public AjaxResult add(@RequestBody ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
        log.info("新增医学评估的infoid为:{}",serviceMedicalevaluationVO.getInfoid());
        boolean save = serviceMedicalevaluationService.add(serviceMedicalevaluationVO);
        long save = serviceMedicalevaluationService.add(serviceMedicalevaluationVO);
        return AjaxResult.success(save);
    }
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfoReport.java
@@ -410,5 +410,20 @@
    @Excel(name = "上报的医院", readConverterExp = "上报的医院")
    private String toHospital;
    /**
     * 确认意见(接收,放弃-需要说明原因)
     */
    @ApiModelProperty("确认意见(接收,放弃-需要说明原因)")
    @Excel(name = "确认意见(接收,放弃-需要说明原因)", readConverterExp = "确认意见(接收,放弃-需要说明原因)")
    private String confirmResult;
    /**
     * 确认时间
     */
    @ApiModelProperty("确认时间")
    @Excel(name = "确认时间", readConverterExp = "确认时间")
    private Date confirmTime;
}
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceMedicalevaluationService.java
@@ -27,7 +27,7 @@
     */
    public List<ServiceMedicalevaluation> queryList(ServiceMedicalevaluation serviceMedicalevaluation);
   public Boolean add(ServiceMedicalevaluationVO serviceMedicalevaluationVO);
   public long add(ServiceMedicalevaluationVO serviceMedicalevaluationVO);
   public Boolean edit(ServiceMedicalevaluationVO serviceMedicalevaluationVO);
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMedicalevaluationServiceImpl.java
@@ -76,7 +76,7 @@
    }
    @Override
    public Boolean add(ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
    public long add(ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
        ServiceMedicalevaluation serviceMedicalevaluation = DtoConversionUtils.sourceToTarget(serviceMedicalevaluationVO, ServiceMedicalevaluation.class);
        boolean save = save(serviceMedicalevaluation);
        if (save && CollectionUtils.isNotEmpty(serviceMedicalevaluationVO.getServiceMedicalevaluationorganList())) {
@@ -86,7 +86,7 @@
                serviceMedicalevaluationorganMapper.insert(serviceMedicalevaluationorgan);
            }
        }
        return save;
        return serviceMedicalevaluation.getId();
    }
    @Override
ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -463,7 +463,7 @@
        <where>sd.del_flag = 0
            <if test="terminationCase != null ">AND sd.termination_case = #{terminationCase}</if>
            <if test="treatmentHospitalName != null ">AND sd.TreatmentHospitalName = #{treatmentHospitalName}</if>
            <if test="name != null ">AND sd.Name = #{name}</if>
            <if test="name != null ">AND sd.Name like concat('%', #{name}, '%')</if>
            <if test="inpatientNo != null ">AND sd.InpatientNo = #{inpatientNo}</if>
            <if test="startAge != null">AND sd.age &gt;= #{startAge}</if>
            <if test="endAge !=null">AND sd.age &lt;= #{endAge}
ruoyi-project/src/main/resources/mapper/project/ServiceDonatemaintenanceMapper.xml
@@ -78,8 +78,8 @@
            <if test="caseNo != null  and caseNo != ''">and case_no = #{caseNo}</if>
            <if test="reportTime != null ">and ReportTime = #{reportTime}</if>
            <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
            <if test="name != null  and name != ''">and name = #{name}</if>
            <if test="coordinatorName != null  and coordinatorName != ''">and coordinator_name = #{coordinatorName}</if>
            <if test="name != null  and name != ''">and name like concat('%', #{name}, '%')</if>
            <if test="coordinatorName != null  and coordinatorName != ''">and coordinator_name like concat('%', #{coordinatorName}, '%')</if>
            <if test="itemNo != null  and itemNo != ''">and item_no = #{itemNo}</if>
            <if test="itemName != null  and itemName != ''">and item_name like concat('%', #{itemName}, '%')</if>
            <if test="itemTime != null ">and item_time = #{itemTime}</if>