ソースを参照

益寿缘总后台处方单查询增加医生组别筛选

cgp 2 週間 前
コミット
8b665691e4

+ 2 - 1
fs-service/src/main/java/com/fs/his/mapper/FsPrescribeMapper.java

@@ -64,7 +64,7 @@ public interface FsPrescribeMapper
      */
     public int deleteFsPrescribeByPrescribeIds(Long[] prescribeIds);
     @Select({"<script> " +
-            "select so.*,us.nick_name,dc.doctor_name,dp.doctor_name doctor_drug_name,fso.order_code,fso.`status` order_status,fse.store_name FROM fs_prescribe so  LEFT JOIN fs_user us ON us.user_id=so.user_id LEFT JOIN fs_doctor dc ON dc.doctor_id = so.doctor_id LEFT JOIN fs_doctor dp ON dp.doctor_id =so.drug_doctor_id LEFT JOIN fs_store_order fso ON fso.order_id = so.store_order_id LEFT JOIN fs_store fse ON fse.store_id = so.store_id "+
+            "select so.*,us.nick_name,dc.doctor_name,dc.group_code,dp.doctor_name doctor_drug_name,fso.order_code,fso.`status` order_status,fse.store_name FROM fs_prescribe so  LEFT JOIN fs_user us ON us.user_id=so.user_id LEFT JOIN fs_doctor dc ON dc.doctor_id = so.doctor_id LEFT JOIN fs_doctor dp ON dp.doctor_id =so.drug_doctor_id LEFT JOIN fs_store_order fso ON fso.order_id = so.store_order_id LEFT JOIN fs_store fse ON fse.store_id = so.store_id "+
             "<where>\n" +
             "        <if test=\"companyId != null \"> and fso.company_id = #{companyId}</if>\n" +
             "        <if test=\"companyUserId != null \"> and fso.company_user_id = #{companyUserId}</if>\n" +
@@ -84,6 +84,7 @@ public interface FsPrescribeMapper
             "        <if test=\"auditETime != null \">  and DATE(so.audit_time) &lt;= DATE(#{auditETime})</if>\n" +
             "        <if test=\"auditTime != null \"> and so.audit_time = #{auditTime}</if>\n" +
             "        <if test=\"orderCode != null \"> and fso.order_code = #{orderCode}</if>\n" +
+            "        <if test=\"groupCode != null \"> and dc.group_code = #{groupCode}</if>\n" +
             "        <if test=\"orderStatus != null \"> and fso.`status` = #{orderStatus}</if>\n" +
             "        <if test=\"storeId != null \"> and so.store_id = #{storeId}</if>\n" +
             "        <if test=\"minOperateSeconds  != null \">  AND so.operate_second &gt;= #{minOperateSeconds}</if>\n" +

+ 3 - 0
fs-service/src/main/java/com/fs/his/param/FsPrescribeParam.java

@@ -142,4 +142,7 @@ public class FsPrescribeParam {
 
     private Integer minOperateSeconds; // 最小耗时(秒),例如 0
     private Integer maxOperateSeconds; // 最大耗时(秒),例如 60(表示 ≤60秒)
+
+    /** 组别 */
+    private String groupCode;
 }

+ 3 - 0
fs-service/src/main/java/com/fs/his/vo/FsPrescribeListVO.java

@@ -178,4 +178,7 @@ public class FsPrescribeListVO {
     //拒方次数
     private Long refuseCount;
 
+    /** 组别 */
+    private String groupCode;
+
 }