zjh 本地 2024/03/6 -2

zjh

2024-03-06 dc23d54849571d2bd38f6f8e1dfdb849047532f6

zjh 本地 2024/03/6 -2

 ltkj-admin/src/main/java/com/ltkj/web/config/captcha/CommonController.java

@@ -196,4 +196,21 @@
            log.error("下载文件失败", e);
        }
    }


    @DeleteMapping("/deletedFile")
    @ApiOperation(value = "通用文件删除接口")
    public AjaxResult deletedFile(@RequestParam String url) {
        //文件后缀
        File files=new File(url);
        String name = files.getName();
        File file=new File(photoPath+name);
        if (file.exists()) {
            if(file.delete()){
                return AjaxResult.success("删除成功");
            }
            return AjaxResult.error("删除失败");
        }
        return AjaxResult.success("删除成功");
    }
}

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -398,16 +398,20 @@
            wq1.eq(TjProject::getProId, tjOrderDetail.getProId());
            TjProject one = projectService.getOne(wq1);
            if (one != null) {
                if (one.getProParentId() != 0) {
//                if (one.getProParentId() != 0) {
                    tjOrderDetail.setTjStatus(2L);
                    tjOrderDetail.setProResult("弃检");
                    tjOrderDetail.setUpdateTime(new DateTime());
                    tjOrderDetailService.updateById(tjOrderDetail);
                } else {
                    tjOrderDetail.setTjStatus(1L);
                    tjOrderDetail.setUpdateTime(new DateTime());
                    tjOrderDetailService.updateById(tjOrderDetail);
                }
//                } else {
//                    tjOrderDetail.setTjStatus(1L);
//                    tjOrderDetail.setUpdateTime(new DateTime());
//                    tjOrderDetailService.updateById(tjOrderDetail);
//                }
//               LambdaQueryWrapper<TjOrderRemark> wq=new LambdaQueryWrapper<>();
//               wq.eq(TjOrderRemark::getTjNumber,tjNumber);
//               wq.eq(TjOrderRemark::getProId,tjOrderDetail.getProId());
               orderRemarkService.updateTjOrderRemark(tjNumber, String.valueOf(tjOrderDetail.getProId()));
                //给弃检表添加记录
                TjDiscardInspection td = new TjDiscardInspection();
                td.setProId(String.valueOf(one.getProId()));

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java

@@ -317,7 +317,12 @@
                List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
                if (one != null && one.size() > 0) {
                    for (LtkjHysqd ltkjHysqd : one) {
//                        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
//                        LambdaQueryWrapper<LtkjHysqd> wq0=new LambdaQueryWrapper<>();
//                        wq0.eq(LtkjHysqd::getTjh,ltkjHysqd.getTjh());
//                        wq0.eq(LtkjHysqd::getTmh,ltkjHysqd.getTmh());
//                        ltkjHysqdService.remove(wq0);
                        ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
                        ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
                        LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
                        if (hysqd == null) {
                            ltkjHysqdService.save(ltkjHysqd);

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHybgdMapper.java

@@ -5,6 +5,7 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;

/**
@@ -15,4 +16,8 @@
@Mapper
@DataSource(value = DataSourceType.MASTER)
public interface LtkjHybgdMapper extends BaseMapper<LtkjHybgd> {


    @Delete("DELETE FROM ltkj_hybgd WHERE tmh=#{tmh} ")
    void  deletedLtkjHybgdByTjhAndTmh(String tmh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjHysqdMapper.java

@@ -5,6 +5,7 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.LtkjExamJcsqd;
import com.ltkj.hosp.sqlDomain.LtkjHysqd;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@@ -20,4 +21,8 @@

    @Select("SELECT * FROM ltkj_hysqd a WHERE a.tjh=#{tjh} AND a.tmh=#{tmh} ")
    LtkjHysqd getLtkjHysqdByTjhAndTmh(@Param("tjh") String tjh,@Param("tmh")  String tmh);


    @Delete("DELETE FROM ltkj_hysqd WHERE tjh=#{tjh} AND tmh=#{tmh} ")
    void  deletedLtkjHysqdByTjhAndTmh(@Param("tjh")String tjh,@Param("tmh")String tmh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java

@@ -113,4 +113,8 @@
    @Select("call pro_lis_sqdbgd(0,#{tjnumber,mode=IN})")
//    @Select("select * from test_remark")
    List<TjOrderRemark> addHuaYanTable(@Param("tjnumber") String tjnumber);


    @Update("UPDATE tj_order_remark a SET a.type=2 WHERE a.tj_number=#{tjnumber} AND a.pro_id=#{proId}")
    void updateTjOrderRemark(@Param("tjnumber")String tjnumber,@Param("proId")String proId);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java

@@ -45,4 +45,7 @@

    List<TjOrderRemark> addHuaYanTable(String tjnumber);


    void updateTjOrderRemark(String tjnumber,String proId);

}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHybgdService.java

@@ -10,4 +10,6 @@
 * @Date: 2023/12/11 17:57
 */
public interface LtkjHybgdService extends IService<LtkjHybgd> {

    void  deletedLtkjHybgdByTjhAndTmh(String tmh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjHysqdService.java

@@ -12,4 +12,7 @@
public interface LtkjHysqdService extends IService<LtkjHysqd> {

    LtkjHysqd getLtkjHysqdByTjhAndTmh(String tjh,String tmh);


    void  deletedLtkjHysqdByTjhAndTmh(String tjh,String tmh);
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHybgdServiceImpl.java

@@ -9,6 +9,8 @@
import com.ltkj.hosp.sqlDomain.LtkjHybgd;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;

/**
 * 病种+意见Service业务层处理
 *
@@ -17,5 +19,11 @@
 */
@Service
public class LtkjHybgdServiceImpl extends ServiceImpl<LtkjHybgdMapper, LtkjHybgd> implements LtkjHybgdService {
    @Resource
    private LtkjHybgdMapper mapper;

    @Override
    public void deletedLtkjHybgdByTjhAndTmh(String tmh) {
        mapper.deletedLtkjHybgdByTjhAndTmh(tmh);
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjHysqdServiceImpl.java

@@ -27,4 +27,9 @@
    public LtkjHysqd getLtkjHysqdByTjhAndTmh(String tjh, String tmh) {
        return mapper.getLtkjHysqdByTjhAndTmh(tjh,tmh);
    }

    @Override
    public void deletedLtkjHysqdByTjhAndTmh(String tjh, String tmh) {
        mapper.deletedLtkjHysqdByTjhAndTmh(tjh,tmh);
    }
}

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java

@@ -87,4 +87,9 @@
        return mapper.addHuaYanTable(tjnumber);
    }

    @Override
    public void updateTjOrderRemark(String tjnumber, String proId) {
        mapper.updateTjOrderRemark(tjnumber,proId);
    }

}