zjh
2023-12-21 d423307d3df56feb412d43f939a49195f3fff92e
zjh 本地 2023/12/21 -2
8个文件已修改
72 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java 32 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjMiddleHeadMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjMiddleHeadService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjMiddleHeadImpl.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjMiddleDetail.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -40,7 +40,7 @@
@RestController
@RequestMapping("/sqlserver/getdata")
@Api(tags = "获取从库数据")
@Api(tags = "AAAAAAAAAAA获取从库数据")
public class TjSqlController extends BaseController {
    @Resource
    private TestMapper testMapper;
@@ -129,6 +129,7 @@
    @GetMapping("/getMiddleDetail")
    @ApiOperation(value = "查询收费项目详情")
    public AjaxResult getMiddleDetail() {
        List<LtkjMiddleDetail> list = testMapper.getMiddleDetail();
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
@@ -141,6 +142,7 @@
    @GetMapping("/getMiddleHead")
    @ApiOperation(value = "查询收费信息")
    public AjaxResult getMiddleHead() {
        List<LtkjMiddleHead> list = testMapper.getMiddleHead();
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
@@ -151,12 +153,28 @@
        return AjaxResult.success(list);
    }
//    @GetMapping("/getVbjitem")
//    @ApiOperation(value = "查看列表")
//    public AjaxResult getVbjitem() {
//        List<LtkjVbjitem> list = testMapper.getVbjitem();
//        return AjaxResult.success(list);
//    }
    @GetMapping("/getMiddleHeadByPartId")
    @ApiOperation(value = "根据身份证号查询收费信息")
    public AjaxResult getMiddleHeadByPartId(@RequestParam String partId) {
        TjCustomer customer = tjCustomerService.getTjCustomerByCusIdCard(partId);
        LtkjMiddleHead pat = testMapper.getMiddleHeadByPartId(customer.getCardId());
        if (null != pat) {
            List<LtkjMiddleDetail> list = testMapper.getMiddleDetailByFeadId(pat.getFeadId());
            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
            LtkjMiddleHead o = headService.getMiddleHeadByPartId(customer.getCardId());
            if(o==null){
                headService.save(pat);
                for (LtkjMiddleDetail ltkjMiddleDetail : list) {
                    middleDetailService.save(ltkjMiddleDetail);
                }
                testMapper.saveTjProByCusId(customer.getCardId(),customer.getCusIdcard());
            }
            testMapper.saveTjProByCusId(customer.getCardId(),customer.getCusIdcard());
        }
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success();
    }
    @GetMapping("/getTjPat")
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -276,7 +276,7 @@
            if (null != tjOrder) {
                tjOrder.setConfirmTime(new DateTime());
                tjOrder.setConfirmDoctor(sysUser.getNickName());
                tjOrder.setConfirmStatus(remark);
                tjOrder.setConfirmStatus(String.valueOf(status));
                if (status == 0) {
                    tjOrder.setStatus(TjConstants.TJ_CHECK);
                    asyncService.updateCheckType(tjNumber);
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -101,7 +101,16 @@
                TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
                if(null == tjCustomer){
                    testMapper.getTjPatByCusId(cusIdcard);
                    LambdaQueryWrapper<TjCustomer> qw = new LambdaQueryWrapper<>();
                    qw.eq(TjCustomer::getCusIdcard, cusIdcard);
                    TjCustomer customer = tjCustomerService.getOne(qw);
                    customer.setReservationId(customer.getCardId());
                    return success(customer);
                }else {
                    tjCustomer.setReservationId(tjCustomer.getCardId());
                    return success(tjCustomer);
                }
            }
            //end====2023.12.12
            LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/LtkjMiddleHeadMapper.java
@@ -5,6 +5,7 @@
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
/**
 * @Company: 西安路泰科技有限公司
@@ -14,4 +15,7 @@
@Mapper
@DataSource(value = DataSourceType.MASTER)
public interface LtkjMiddleHeadMapper extends BaseMapper<LtkjMiddleHead> {
    @Select("SELECT * FROM ltkj_middle_head where fead_id=#{partId}")
    public LtkjMiddleHead getMiddleHeadByPartId(String partId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -22,9 +22,18 @@
    @DataSource(value = DataSourceType.SLAVE_HIS)
    public List<LtkjMiddleDetail> getMiddleDetail();
    @Select("SELECT * FROM histjv_Ltkj_middle_detail where fhead_id=#{feadId}")
    @DataSource(value = DataSourceType.SLAVE_HIS)
    public List<LtkjMiddleDetail> getMiddleDetailByFeadId(String feadId);
    @DataSource(value = DataSourceType.SLAVE_LIS)
    @Select("SELECT * FROM histjv_Ltkj_middle_head")
    public List<LtkjMiddleHead> getMiddleHead();
    @DataSource(value = DataSourceType.SLAVE_LIS)
    @Select("SELECT * FROM histjv_Ltkj_middle_head where fead_id=#{partId}")
    public LtkjMiddleHead getMiddleHeadByPartId(String partId);
//    @Select("SELECT * FROM histjv_LTKJVBJITEM")
//    public List<LtkjVbjitem> getVbjitem();
@@ -42,6 +51,10 @@
    @Select("call pro_his_tjpart(#{sfzh,mode=IN})")
    public void getTjPatByCusId(String cusId);
    @DataSource(value = DataSourceType.MASTER)
    @Select("call pro_his_middle(#{sfzh,mode=IN},#{sfzbm,mode=IN})")
    public void saveTjProByCusId(@Param("sfzh") String sfzh,@Param("sfzbm")String sfzbm);
    @DataSource(value = DataSourceType.SLAVE_HIS)
    @Select("SELECT * FROM histjv_exam_jcbgd")
    public List<LtkjExamJcbgd> getExamJcbgd();
ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjMiddleHeadService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
import org.apache.ibatis.annotations.Select;
/**
 * @Company: 西安路泰科技有限公司
@@ -9,4 +10,6 @@
 * @Date: 2023/12/11 17:57
 */
public interface LtkjMiddleHeadService extends IService<LtkjMiddleHead> {
    public LtkjMiddleHead getMiddleHeadByPartId(String partId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjMiddleHeadImpl.java
@@ -8,6 +8,8 @@
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
 * 病种+意见Service业务层处理
 *
@@ -16,5 +18,11 @@
 */
@Service
public class LtkjMiddleHeadImpl extends ServiceImpl<LtkjMiddleHeadMapper, LtkjMiddleHead>  implements LtkjMiddleHeadService {
    @Resource
    private LtkjMiddleHeadMapper mapper;
    @Override
    public LtkjMiddleHead getMiddleHeadByPartId(String partId) {
        return mapper.getMiddleHeadByPartId(partId);
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjMiddleDetail.java
@@ -19,5 +19,6 @@
    private String sumTotal;
    private String discount;
    private String checkexamId;
    private String hisPacBm;
    private String zhfybh;
}