1
lige
2023-12-13 55656cdf4c311d1e6a138173ba5e5bd09c23d340
1
6个文件已修改
258 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/resources/application.yml 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -15,6 +15,8 @@
import javax.annotation.Resource;
import java.util.List;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
@RestController
@RequestMapping("/sqlserver/getdata")
@@ -128,76 +130,37 @@
    }
    @GetMapping("/getLtkjTjPatById")
    public AjaxResult getLtkjTjPatById(String id) {
        LtkjTjPat one = testMapper.getTjPatById(id);
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
        final boolean save = tjvLtkjvtjpatService.save(one);
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success(save);
    }
    @GetMapping("/getMiddleDetailById")
    public AjaxResult getMiddleDetailById(String id) {
        LtkjMiddleDetail one = testMapper.getMiddleDetailById(id);
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
        final boolean save = middleDetailService.save(one);
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success(save);
    }
    @GetMapping("/getMiddleHeadById")
    public AjaxResult getMiddleHeadById(String id) {
        LtkjMiddleHead one = testMapper.getMiddleHeadById(id);
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
        final boolean save = headService.save(one);
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success(save);
    }
    @GetMapping("/getExamJcbgdById")
    public AjaxResult getExamJcbgdById(String id) {
        LtkjExamJcbgd one = testMapper.getExamJcbgdById(id);
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
        final boolean save = ltkjExamJcbgdService.save(one);
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success(save);
    }
    @GetMapping("/getExamJcsqdById")
    public AjaxResult getExamJcsqdById(String id) {
        LtkjExamJcsqd one = testMapper.getExamJcsqdById(id);
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
        final boolean save = ltkjExamJcsqdService.save(one);
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success(save);
    }
    @GetMapping("/getHybgdById")
    public AjaxResult getHybgdById(String id) {
        LtkjHybgd one = testMapper.getHybgdById(id);
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
        final boolean save = ltkjHybgdService.save(one);
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success(save);
    }
    @GetMapping("/getHysqdById")
    public AjaxResult getHysqdById(String id) {
        LtkjHysqd one = testMapper.getHysqdById(id);
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
        final boolean save = ltkjHysqdService.save(one);
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success(save);
    }
    @GetMapping("/getTjPatByCusId")
    public AjaxResult getTjPatByCusId(String cusId) {
        testMapper.getTjPatByCusId(cusId);
        return AjaxResult.success();
    }
    @GetMapping("/saveMiddleHeadByPatId")
    public AjaxResult saveMiddleHeadByPatId(String id) {
        List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(id);
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
        for (LtkjMiddleHead ltkjMiddleHead : one) {
            final boolean save = headService.save(ltkjMiddleHead);
        }
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success(save);
    }
    @GetMapping("/getMiddleDetailByHeadId")
    public AjaxResult getMiddleDetailByHeadId(String id) {
        List<LtkjMiddleDetail> one = testMapper.getMiddleDetailByHeadId(id);
        for (LtkjMiddleDetail ltkjMiddleDetail : one) {
            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
            final boolean save = middleDetailService.save(ltkjMiddleDetail);
            DynamicDataSourceContextHolder.clearDataSourceType();
        }
        return AjaxResult.success(one);
    }
}
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -8,11 +8,15 @@
import com.ltkj.common.core.domain.AjaxResult;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.StringUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.*;
import com.ltkj.hosp.vodomain.CsProVo;
import com.ltkj.hosp.vodomain.UpdateOrderRemarkVo;
import com.ltkj.mall.mallOrderUtils.TjConstants;
@@ -31,6 +35,8 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
import static org.apache.poi.hemf.record.emfplus.HemfPlusRecordType.save;
/**
 * @Author: 西安路泰科技有限公司/赵佳豪
@@ -70,6 +76,25 @@
    private ISysConfigService configService;
    @Resource
    private ISysDeptService deptService;
    @Resource
    private TestMapper testMapper;
    @Resource
    private TjvLtkjvtjpatService tjvLtkjvtjpatService;
    @Resource
    private LtkjMiddleDetailService middleDetailService;
    @Resource
    private LtkjMiddleHeadService headService;
    @Resource
    private LtkjExamJcbgdService ltkjExamJcbgdService;
    @Resource
    private LtkjExamJcsqdService ltkjExamJcsqdService;
    @Resource
    private LtkjHybgdService ltkjHybgdService;
    @Resource
    private LtkjHysqdService ltkjHysqdService;
    @GetMapping("/getOperationPermissionsByTjNum")
@@ -222,7 +247,6 @@
     */
    @GetMapping("/confirmOrder")
    @ApiOperation(value = "初审(并修改状态)接口")
//    @PreAuthorize("@ss.hasPermi('check:check:confirmOrder')")
    @Transactional
    public AjaxResult confirmOrder(@ApiParam(value = "tjNumber") @RequestParam String tjNumber,
                                   @ApiParam(value = "状态 0同意 1拒绝 默认同意") @RequestParam(defaultValue = "0") Integer status,
@@ -262,16 +286,48 @@
    /**
     * 同步数据接口
     */
    @GetMapping("/dataSynchronization")
    @ApiOperation(value = "同步数据接口")
    @Transactional
    public AjaxResult dataSynchronization(@RequestParam String tjNumber){
        List<LtkjHysqd> one = testMapper.getHysqdByTmh(tjNumber);
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
        for (LtkjHysqd hysqd : one) {
            ltkjHysqdService.save(hysqd);
            List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(hysqd.getTmh());
            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
            for (LtkjHybgd hybgd : one1) {
                ltkjHybgdService.save(hybgd);
            }
            DynamicDataSourceContextHolder.clearDataSourceType();
        }
        DynamicDataSourceContextHolder.clearDataSourceType();
        List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
        for (LtkjExamJcsqd examJcsqd : one2) {
            ltkjExamJcsqdService.save(examJcsqd);
            List<LtkjExamJcbgd> one3 = testMapper.getExamJcbgdByTjh(examJcsqd.getTmh());
            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
            for (LtkjExamJcbgd examJcbgd : one3) {
                ltkjExamJcbgdService.save(examJcbgd);
            }
            DynamicDataSourceContextHolder.clearDataSourceType();
        }
        DynamicDataSourceContextHolder.clearDataSourceType();
        return AjaxResult.success();
    }
    /**
     * 查询体检记录客户列表
     *
     * @param tjNumber
     * @param checkStatus
     * @param page
     * @param pageSize
     * @param compId
     * @param beginTime
     * @param endTime
     * @return
     */
    @GetMapping("/getList")
    @ApiOperation(value = "查询体检记录客户列表")//0待1已
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -81,7 +81,7 @@
//                 LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
                 testMapper.getTjPatByCusId(cusIdcard);
            }
            //end2023.12.12
            //end====2023.12.12
            LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
            wq.eq(TjReservation::getIdCard, cusIdcard);
            wq.eq(TjReservation::getIsExpire, 2);
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -24,11 +24,16 @@
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.core.domain.entity.SysUser;
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
import com.ltkj.hosp.sqlDomain.LtkjMiddleHead;
import com.ltkj.hosp.vodomain.BingZhongVO;
import com.ltkj.hosp.vodomain.HistoryTjOrder;
import com.ltkj.hosp.vodomain.QjDomainVo;
@@ -135,6 +140,15 @@
    @Autowired
    private ITjReportGetAddressService tjReportGetAddressService;
    @Resource
    private TestMapper testMapper;
    @Resource
    private LtkjMiddleDetailService middleDetailService;
    @Resource
    private LtkjMiddleHeadService headService;
    /**
@@ -917,6 +931,25 @@
//                asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
            }
            //调用SQL server拿取收费情况
            List<LtkjMiddleHead> one = testMapper.saveMiddleHeadByPatId(tjCustomer.getCusIdcard());
            if (one!=null){
                for (LtkjMiddleHead ltkjMiddleHead : one) {
                    DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
                    headService.save(ltkjMiddleHead);
                    DynamicDataSourceContextHolder.clearDataSourceType();
                    List<LtkjMiddleDetail> detailList = testMapper.getMiddleDetailByHeadId(ltkjMiddleHead.getFeadId());
                    if (detailList!=null){
                        for (LtkjMiddleDetail ltkjMiddleDetail : detailList) {
                            DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
                            middleDetailService.save(ltkjMiddleDetail);
                            DynamicDataSourceContextHolder.clearDataSourceType();
                        }
                    }
                }
            }
            return AjaxResult.success(tjNumber);
        }
        return AjaxResult.error();
ltkj-admin/src/main/resources/application.yml
@@ -11,8 +11,8 @@
  # 文件路径 示例( Windows配置D:/ltkj/uploadPath,Linux配置 /home/ltkj/uploadPath)
  # 用户换头像后的图片存储地址  测试:D:\ltkj\uploadPath\avatar\2022\12\14
  #profile: D:/ltkj/uploadPath
#  profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
  profile: http://192.168.0.5:5502/uploadPath
  profile: https://ltpeis.xaltjdkj.cn:5502/uploadPath
#  profile: http://192.168.0.5:5502/uploadPath
  # 获取ip地址开关
  addressEnabled: true
@@ -73,15 +73,15 @@
  # redis 配置
  redis:
    # 地址
#    host: 101.42.27.146
    host: localhost
    host: 101.42.27.146
#    host: localhost
    # 端口,默认为6379
    port: 6379
    # 数据库索引
    database: 0
    # 密码
#    password: 654321
    password: 123456
    password: 654321
#    password: 123456
    # 连接超时时间
    timeout: 120s
    lettuce:
@@ -180,8 +180,8 @@
#  体检套餐和轮播图存储路径
photoPath: D:\AppPhoto\uploadPath\
# nginx图片服务器
#photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
photoServer: http://192.168.0.5:5502/uploadPath/
photoServer: https://ltpeis.xaltjdkj.cn:5502/uploadPath/
#photoServer: http://192.168.0.5:5502/uploadPath/
# 微信小程序appid secret
xcx:
@@ -211,8 +211,8 @@
#积木报表访问地址
jimu:
#  path: https://ltpeis.xaltjdkj.cn:5011/ltkj-admin
#  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
  path: http://192.168.0.5:5000/ltkj-admin
  path: https://ltpeis.xaltjdkj.cn:5021/ltkj-admin
#  path: http://192.168.0.5:5000/ltkj-admin
#   path: http://10.168.0.9:5011
#  path: http://192.168.0.99:8081/ltkj-admin
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -88,4 +88,36 @@
    @DataSource(value = DataSourceType.SLAVE_HIS)
    @Select("SELECT * FROM tjv_Ltkj_hysqd  where tmh=#{id}")
    public LtkjHysqd getHysqdById(String id);
    //体检登记接口  调用后  查询收费单据和详情
    @DataSource(value = DataSourceType.SLAVE_HIS)
    @Select("SELECT * FROM tjv_Ltkj_middle_head where pat_bar_code=#{id}")
    public List<LtkjMiddleHead> saveMiddleHeadByPatId(String id);
    @DataSource(value = DataSourceType.SLAVE_HIS)
    @Select("SELECT * FROM tjv_Ltkj_middle_detail where fead_id=#{id}")
    public List<LtkjMiddleDetail> getMiddleDetailByHeadId(String id);
    //根据体检号  对应的   化验项目    +“血清”标本
    @DataSource(value = DataSourceType.SLAVE_HIS)
    @Select("SELECT * FROM tjv_Ltkj_hysqd where tjh=#{id}")
    public List<LtkjHysqd> getHysqdByTmh(String id);
    //化验项目下的子项    传上面的接口的tmh
    @DataSource(value = DataSourceType.SLAVE_HIS)
    @Select("SELECT * FROM tjv_Ltkj_hybgd where tmh=#{id}")
    public  List<LtkjHybgd> getHybgdByTmh(String id);
    //根据体检号  对应的  检查项目
    @DataSource(value = DataSourceType.SLAVE_HIS)
    @Select("SELECT * FROM tjv_exam_jcsqd where tjh=#{id}")
    public List<LtkjExamJcsqd> getExamJcsqdTmh(String id);
    //检查项目对应的检查结果  传上面的接口的结果tmh
    @DataSource(value = DataSourceType.SLAVE_HIS)
    @Select("SELECT * FROM tjv_exam_jcbgd where tmh=#{id}")
    public List<LtkjExamJcbgd> getExamJcbgdByTjh(String id);
}