zjh
2023-12-21 fd05507e8595739c80f485d67fdeeed91708f746
zjh 本地 2023/12/21 -1
7个文件已修改
84 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjvLtkjvtjpatMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjvLtkjvtjpatService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjvLtkjvtjpatServiceImpl.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjTjPat.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/sqlserver/TjSqlController.java
@@ -8,6 +8,7 @@
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
import com.ltkj.hosp.domain.TjOrderRemark;
import com.ltkj.hosp.service.*;
@@ -62,6 +63,8 @@
    private LtkjHysqdService ltkjHysqdService;
    @Autowired
    public RedisTemplate<Object,Object> redisTemplate;
    @Resource
    private ITjCustomerService tjCustomerService;
    @Resource
    private RedisCache redisCache;
    @Resource
@@ -157,6 +160,7 @@
    @GetMapping("/getTjPat")
    @ApiOperation(value = "测试getTjPat")
    public AjaxResult getTjPat() {
        List<LtkjTjPat> list = testMapper.getTjPat();
        DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
@@ -167,6 +171,31 @@
        return AjaxResult.success(list);
    }
    @GetMapping("/getTjPatByIdCard")
    @ApiOperation(value = "根据身份证号测试getTjPat")
    public AjaxResult getTjPatByIdCard(@RequestParam String idCard) {
        LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(idCard.trim());
        if(null != tjPatByIdCard){
            String fcardNo = tjPatByIdCard.getFcardNo();
            if(null !=fcardNo){
                fcardNo=fcardNo.trim();
                tjPatByIdCard.setFcardNo(fcardNo);
            }
            LtkjTjPat ltkjTjPat = tjvLtkjvtjpatService.getLtkjTjPatByCusIdCard(idCard);
            if(null==ltkjTjPat){
                tjvLtkjvtjpatService.save(tjPatByIdCard);
            }
        }
        DynamicDataSourceContextHolder.clearDataSourceType();
        //再根据身份证号写customer表
        TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(idCard);
        if(null == tjCustomer){
            testMapper.getTjPatByCusId(idCard);
        }
        return AjaxResult.success(tjPatByIdCard);
    }
    @GetMapping("/getExamJcbgd")
    public AjaxResult getExamJcbgd() {
        List<LtkjExamJcbgd> list = testMapper.getExamJcbgd();
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -65,7 +65,7 @@
     */
    @PostMapping(value = "/cusIdcard")
    @ApiOperation(value = "根据身份证号获取用户信息")
    @Log(title = "客户身份信息", businessType = BusinessType.EXPORT)
//    @Log(title = "客户身份信息", businessType = BusinessType.EXPORT)
    public AjaxResult getInfoByIdCard(@RequestParam @ApiParam(value = "客户身份证号") String cusIdcard) {
        if (!"".equals(cusIdcard) && cusIdcard != null) {
            //判断身份证号格式是否正确
@@ -85,18 +85,23 @@
            if ("Y".equals(getInfoFromSqlData)){
                //根据身份证好查信息
                 LtkjTjPat tjPatByIdCard = testMapper.getTjPatByIdCard(cusIdcard);
                 //List<LtkjTjPat> list = testMapper.getTjPat();
//                DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
//                for (LtkjTjPat ltkjTjPat : list) {
//                    final boolean save = tjvLtkjvtjpatService.save(ltkjTjPat);
//                }
                //不为空保存到临时表
                if(null != tjPatByIdCard){
                    String fcardNo = tjPatByIdCard.getFcardNo();
                    if(null !=fcardNo){
                        fcardNo=fcardNo.trim();
                        tjPatByIdCard.setFcardNo(fcardNo);
                    }
                    LtkjTjPat ltkjTjPat = tjvLtkjvtjpatService.getLtkjTjPatByCusIdCard(cusIdcard);
                    if(null==ltkjTjPat){
                    tjvLtkjvtjpatService.save(tjPatByIdCard);
                }
                }
                DynamicDataSourceContextHolder.clearDataSourceType();
                //再根据身份证号写进预约表
                //再根据身份证号写customer表
                TjCustomer tjCustomer = tjCustomerService.getTjCustomerByCusIdCard(cusIdcard);
                if(null == tjCustomer){
                 testMapper.getTjPatByCusId(cusIdcard);
                }
            }
            //end====2023.12.12
            LambdaQueryWrapper<TjReservation> wq = new LambdaQueryWrapper<>();
@@ -137,7 +142,6 @@
                    tjCustomer1.setReservationId(tjReservation.getId());
                    tjCustomer1.setDiscount(tjReservation.getDiscount());
                    tjCustomer1.setGroupingId(tjReservation.getGroupingId());
                    return success(tjCustomer1);
                }
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TestMapper.java
@@ -34,7 +34,7 @@
    public List<LtkjTjPat> getTjPat();
    @DataSource(value = DataSourceType.SLAVE_HIS)
    @Select("SELECT * FROM histjv_LTKJVTJPAT where fcard_no=#{id}")
    @Select("SELECT * FROM histjv_LTKJVTJPAT where Ltrim(Rtrim(fcard_no)) = #{id} ")
    public LtkjTjPat getTjPatByIdCard(String id);
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjvLtkjvtjpatMapper.java
@@ -6,6 +6,7 @@
import com.ltkj.hosp.domain.TjTollCollector;
import com.ltkj.hosp.sqlDomain.LtkjTjPat;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;
/**
 * @Company: 西安路泰科技有限公司
@@ -15,4 +16,7 @@
@Mapper
@DataSource(value = DataSourceType.MASTER)
public interface TjvLtkjvtjpatMapper extends BaseMapper<LtkjTjPat> {
    @Select("SELECT * FROM ltkj_tj_pat where fcard_no = #{idCard} ")
    LtkjTjPat getLtkjTjPatByCusIdCard(String idCard);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjvLtkjvtjpatService.java
@@ -10,4 +10,6 @@
 * @Date: 2023/12/11 17:57
 */
public interface TjvLtkjvtjpatService  extends IService<LtkjTjPat> {
    LtkjTjPat getLtkjTjPatByCusIdCard(String idCard);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjvLtkjvtjpatServiceImpl.java
@@ -9,6 +9,8 @@
import com.ltkj.hosp.sqlDomain.LtkjTjPat;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
 * 病种+意见Service业务层处理
 *
@@ -18,4 +20,11 @@
@Service
public class TjvLtkjvtjpatServiceImpl extends ServiceImpl<TjvLtkjvtjpatMapper, LtkjTjPat>  implements TjvLtkjvtjpatService {
    @Resource
    private TjvLtkjvtjpatMapper mapper;
    @Override
    public LtkjTjPat getLtkjTjPatByCusIdCard(String idCard) {
        return mapper.getLtkjTjPatByCusIdCard(idCard);
    }
}
ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjTjPat.java
@@ -1,20 +1,28 @@
package com.ltkj.hosp.sqlDomain;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
 * @Company: 西安路泰科技有限公司
 * @Author: lige
 * @Date: 2023/12/11 17:20
 */
@Data
@Getter
@Setter
@NoArgsConstructor
public class LtkjTjPat {
    private String patId;
    private String patName;
    private String patsexId;
    private String patbDate;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date patbDate;
    private String addressHeng;
    private String addressHi;
    private String addresXianq;
@@ -27,4 +35,8 @@
    private String postBox;
    private String fcardId;
    private String fcardNo;
    private Integer brnl;
    private String brnldw;
    private String mzbm;
    private String hyzkbm;
}