zjh
2024-01-23 3fbed744dae198ae9743f21a611e9e1ff096e0be
zjh 2024/01/23--1
5个文件已修改
32 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPureToneTest.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1687,6 +1687,7 @@
    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
        tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
        tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(),tjOrder.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
        //修改每项的原价现价 //修改临时表体检号
        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount,tjOrder.getTjNumber());
        //添加remark表数据
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjPureToneTest.java
@@ -28,7 +28,7 @@
     * id
     */
    @TableId(type = IdType.AUTO)
    private String id;
    private Long id;
    /**
     * 体检号
@@ -103,11 +103,11 @@
    private List<TjPureToneTestDetil> pureToneTestDetils;
    public void setId(String id) {
    public void setId(Long id) {
        this.id = id;
    }
    public String getId() {
    public Long getId() {
        return id;
    }
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderDetailMapper.java
@@ -126,6 +126,22 @@
     boolean saveTjOrderDetailsByCusId(@Param("cusId")String cusId,@Param("orderId")String orderId,@Param("userName")String userName,@Param("userId") String userId);
    @Insert("INSERT INTO tj_pure_tone_test (\n" +
            "  tj_num,\n" +
            "\tcus_id,\n" +
            "\tcus_name,\n" +
            "\tpro_id,\n" +
            "\tpro_name,\n" +
            "\tcreate_by,\n" +
            "\tcreate_time,\n" +
            "\tcreate_id\n" +
            ")\n" +
            "SELECT #{tjNum},b.cus_id,b.cus_name,'1633660948860522619','纯音听阈'," +
            "#{userName},SYSDATE(),#{userId} FROM tb_transition a LEFT JOIN tj_customer b " +
            "ON a.cus_id=b.cus_idcard WHERE a.cus_id=#{cusId} AND a.parent_pro_id IN('1633660948860522619') GROUP BY a.cus_id")
    boolean saveTjPureToneTesByCusId(String cusId,String tjNum,String userName, String userId);
    @Update("UPDATE tj_order_detail a SET\n" +
            "a.flowing_water_id=#{ls} ,\n" +
            "a.update_time=SYSDATE(),\n" +
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderDetailService.java
@@ -93,6 +93,9 @@
    boolean saveTjOrderDetailsByCusId(String cusId,String orderId,String userName, String userId);
    boolean saveTjPureToneTesByCusId(String cusId,String tjNum,String userName, String userId);
    boolean updateTjOrderDetailsByOrderId(String orderId,String userName, String userId,String ls);
    public List<TjOrderDetail> getDetailByOrderIdAndParId(Long orderId,Long proParentId);
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderDetailServiceImpl.java
@@ -139,6 +139,12 @@
    }
    @Override
    public boolean saveTjPureToneTesByCusId(String cusId, String tjNum, String userName, String userId) {
        return tjOrderDetailMapper.saveTjPureToneTesByCusId(cusId,tjNum,userName,userId);
    }
    @Override
    public boolean updateTjOrderDetailsByOrderId(String orderId, String userName, String userId,String ls) {
        return tjOrderDetailMapper.updateTjOrderDetailsByOrderId(orderId,userName,userId,ls);
    }