患者有出院医嘱就查询全部，没有就只查询当天以前的。

src/main/java/thyyxxk/webserver/dao/his/yibao/XiangMuLuRuDao.java

@@ -1031,6 +1031,9 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "  and charge_fee &lt; 0 and charge_code not like 'BILL%' " +
             "  and  trans_flag_yb not in (1,2) " +
             "  and ori_detail_sn is null " +
+            "<if test=\"chuYuanYiZhu == 1\">" +
+            "  and charge_date &lt;= CONVERT(varchar(100), GETDATE(), 23)" +
+            "</if>" +
             "<if test=\"list.size >0 \">" +
             " and exec_unit in " +
             "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
@@ -1042,7 +1045,8 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
                                                      @Param("admissTimes") Integer admissTimes,
                                                      @Param("ledger") Integer ledger,
                                                      @Param("infantFlag") Integer infantFlag,
-                                                     @Param("list") List<String> execUnit);
+                                                     @Param("list") List<String> execUnit,
+                                                     @Param("chuYuanYiZhu") Integer chuYuanYiZhu);
 
     @Select("<script>" +
             "select rtrim(inpatient_no) inpatient_no,admiss_times,ledger_sn,charge_code_mx,detail_sn,ori_detail_sn,charge_fee,charge_amount, " +
@@ -1053,7 +1057,10 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "  and charge_fee &lt; 0 and charge_code  like 'BILL%' " +
             "  and  trans_flag_yb not in (1,2) " +
             "  and ori_detail_sn is null" +
-            "<if test=\"list.size >0 \">" +
+            "<if test=\"chuYuanYiZhu == 1\">" +
+            "  and charge_date &lt;= CONVERT(varchar(100), GETDATE(), 23)" +
+            "</if>" +
+            "<if test=\"list.size > 0 \">" +
             " and exec_unit in " +
             "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
             "#{item}" +
@@ -1064,7 +1071,8 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
                                                      @Param("admissTimes") Integer admissTimes,
                                                      @Param("ledger") Integer ledger,
                                                      @Param("infantFlag") Integer infantFlag,
-                                                     @Param("list") List<String> execUnit);
+                                                     @Param("list") List<String> execUnit,
+                                                     @Param("chuYuanYiZhu") Integer chuYuanYiZhu);
 
     @Select("<script>" +
             "select inpatient_no,admiss_times,ledger_sn,detail_sn,charge_amount,charge_fee,charge_code_mx,charge_date,ori_detail_sn " +

src/main/java/thyyxxk/webserver/entity/yibao/ZyActpatient.java

@@ -28,6 +28,12 @@ public class ZyActpatient implements Serializable {
     private Integer maxDetailSn;
     private String staffId;
 
+    /**
+     * 0 - 没有出院医嘱
+     * 1 - 有出院医嘱
+     */
+    private Integer chuYuanYiZhu;
+
     private String reqExecUnit;
 
     @TableField(exist = false)

src/main/java/thyyxxk/webserver/service/PublicServer.java

@@ -236,7 +236,6 @@ public class PublicServer {
         if (zyActpatient == null) {
             throw new BizException(ExceptionEnum.NULL_POINTER, "没有查询到患者的基本信息。");
         }
-
         return zyActpatient;
     }
 

src/main/java/thyyxxk/webserver/service/yibao/XiangMuLuRuService.java

@@ -217,7 +217,7 @@ public class XiangMuLuRuService {
                 }
             } else if (!xuYaoTuiDeShuJu.getDeptCode().equals(piPeiDeShuJu.getExecUnit())) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，请对应的执行科室进行退费。<br/>( ´Д｀)y━・~~", piPeiDeShuJu.getDetailSn()));
-            } else if (!BigUtils.dengYu(piPeiDeShuJu.getOrderNo(), 3)) {
+            } else if ((BigUtils.bigDaYu(piPeiDeShuJu.getOrderNo(), 100) || BigUtils.bigXiaoYu(piPeiDeShuJu.getOrderNo(), 0)) && piPeiDeShuJu.getSerial().equals("01")) {
                 return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("流水号为【%s】，只能退本科室录入的药品。<br/>( ´Д｀)y━・~~", piPeiDeShuJu.getDetailSn()));
             }
         }
@@ -631,11 +631,10 @@ public class XiangMuLuRuService {
 
         patient.setWeiPiPei(new ArrayList<>());
         patient.setWeiXieDaiYuanLiuShui(new ArrayList<>());
-
         patient.getWeiPiPei().addAll(dao.weiGuiYaoPin(inpatientNo, patient.getAdmissTimes(), ledger, infantFlag));
         patient.getWeiPiPei().addAll(dao.weiGuiXiangMu(inpatientNo, patient.getAdmissTimes(), ledger, infantFlag));
-        patient.getWeiXieDaiYuanLiuShui().addAll(dao.weiXieDaiYuanLiuShuiXiangMu(inpatientNo, patient.getAdmissTimes(), ledger, infantFlag, keShi));
-        patient.getWeiXieDaiYuanLiuShui().addAll(dao.weiXieDaiYuanLiuShuiYaoPing(inpatientNo, patient.getAdmissTimes(), ledger, infantFlag, keShi));
+        patient.getWeiXieDaiYuanLiuShui().addAll(dao.weiXieDaiYuanLiuShuiXiangMu(inpatientNo, patient.getAdmissTimes(), ledger, infantFlag, keShi, patient.getChuYuanYiZhu()));
+        patient.getWeiXieDaiYuanLiuShui().addAll(dao.weiXieDaiYuanLiuShuiYaoPing(inpatientNo, patient.getAdmissTimes(), ledger, infantFlag, keShi, patient.getChuYuanYiZhu()));
         return ResultVoUtil.success(patient);
     }