From d866e43afbe901bfc640776e02f767b9045acbc2 Mon Sep 17 00:00:00 2001 From: 赵文轩 <1652863494@qq.com> Date: 星期三, 12 六月 2024 09:04:56 +0800 Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peis --- ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java index 82ce1ad..e05e048 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java @@ -26,7 +26,7 @@ @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND pro_id=#{proParentId} AND deleted='0'") TjOrderRemark getTjOrderRemarkByTjNumAndProParentId(@Param("tjNumber") String tjNumber,@Param("proParentId") String proParentId); - @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type=3 or type=0 AND deleted=0") + @Select("SELECT COUNT(*) a FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type IN (0,3) AND deleted=0") int getTjYqOrderRemarkByTjNum(String tjNumber); @Delete("DELETE FROM tj_order_remark WHERE tj_number=#{tjNumber}") @@ -67,7 +67,8 @@ boolean saveTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId); - @Select("SELECT * FROM tj_order_remark WHERE tj_number=#{tjNumber} AND type =1 AND deleted='0'") + @Select("SELECT * FROM tj_order_remark a LEFT JOIN tj_project b ON a.pro_id=b.pro_id WHERE a.tj_number=#{tjNumber}" + + " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257,251,271) ")//and a.dept_id in (269,270,253,254,255,257) List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber); @@ -104,7 +105,16 @@ "\tLEFT JOIN tj_project pro ON re.pro_id = pro.pro_id\n" + "\tLEFT JOIN sys_user us ON us.user_id = re.doctor_name \n" + "WHERE\n" + - "\tre.type != 2 and pro.need_report='Y' \n" + + "\tre.type != 2 \n" +//and pro.need_report='Y' "\tAND re.tj_number =#{tjNumber}") List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber); + + + @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); } -- Gitblit v1.8.0