Browse Source

修改一些信息。

xiaochan 3 years ago
parent
commit
ede599e240

+ 12 - 2
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyiji/QueRenYiZhuShouFeiDao.java

@@ -41,10 +41,13 @@ public interface QueRenYiZhuShouFeiDao {
             "and status_flag > '2' and isnull(group_no,'00' )='00' and order_code in ('06026','06053','05973')) > 0  " +
             "then 1 else 0 end  " +
             "FROM yz_zy_patient_fee a  left join  zy_actpatient b on (a.inpatient_no = b.inpatient_no and a.admiss_times = b.admiss_times)  " +
-            "where a.charge_status ${liShi}'3' and a.exec_unit in " +
+            "where a.charge_status ${liShi}'3' " +
+            "<if test=\"list.size > 0\">" +
+            "and a.exec_unit in " +
             "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
             "    #{item}  " +
             "</foreach>" +
+            "</if>" +
             "<if test=\"inpatientNo !=null and inpatientNo != '' \">" +
             " and a.inpatient_no = #{inpatientNo}  " +
             "</if>" +
@@ -94,10 +97,13 @@ public interface QueRenYiZhuShouFeiDao {
             "and status_flag > '2' and isnull(group_no,'00' )='00' and order_code in ('06026','06053','05973')) > 0  " +
             "then 1 else 0 end  " +
             "FROM yz_zy_patient_fee a  left join  zy_actpatient b on (a.inpatient_no = b.inpatient_no and a.admiss_times = b.admiss_times)  " +
-            "where a.charge_status ${liShi} '3' and a.exec_unit in " +
+            "where a.charge_status ${liShi} '3' " +
+            "<if test=\"list.size > 0\">" +
+            "and a.exec_unit in " +
             "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
             "    #{item}  " +
             "</foreach>" +
+            "</if>" +
             "<if test=\"inpatientNo !=null and inpatientNo != '' \">" +
             " and a.inpatient_no = #{inpatientNo}  " +
             "</if>" +
@@ -144,10 +150,12 @@ public interface QueRenYiZhuShouFeiDao {
             " and convert(varchar(20),a.occ_time,23)&lt;=convert(varchar(20),getdate(),23) " +
             "</otherwise>" +
             "</choose>" +
+            "<if test=\"list.size > 0\">" +
             "and a.exec_unit in " +
             "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
             "    #{item}  " +
             "</foreach>" +
+            "</if>" +
             "and a.inpatient_no in " +
             "<foreach collection='inpatientNoList' item='item' index='index' open='(' close=')' separator=','>" +
             "    #{item.inpatientNo}  " +
@@ -187,10 +195,12 @@ public interface QueRenYiZhuShouFeiDao {
             "left join zd_unit_code f on (a.ward_code = f.code)  " +
             "where a.charge_status &lt;&gt; '3' " +
             " and convert(varchar(20),a.occ_time,23)&lt;=convert(varchar(20),getdate(),23) " +
+            "<if test=\"list.size > 0\">" +
             " and a.exec_unit in " +
             "<foreach collection='list' item='item' index='index' open='(' close=')' separator=','>" +
             "    #{item}  " +
             "</foreach>" +
+            "</if>" +
             "<if test=\"yiQueFeiShuJu != null and yiQueFeiShuJu.size > 0 \">" +
             " and a.inpatient_no in " +
             "<foreach collection='yiQueFeiShuJu' item='item' index='index' open='(' close=')' separator=','>" +

+ 3 - 0
src/main/java/thyyxxk/webserver/service/PublicServer.java

@@ -104,6 +104,9 @@ public class PublicServer {
      * @return 返回科室
      */
     public List<String> getKeShiLieBiaoList(String deptCode) {
+        if (StringUtil.isBlank(deptCode) || deptCode.equals("3100000")) {
+            return new ArrayList<>();
+        }
         return dao.getKeShiLieBiao(deptCode);
     }
 

+ 1 - 1
src/main/java/thyyxxk/webserver/service/zhuyuanyiji/QueRenYiZhuShouFeiServer.java

@@ -134,7 +134,7 @@ public class QueRenYiZhuShouFeiServer {
                 }
             }
         }
-        if (xuYaoFeiYongJieShou.isEmpty()) {
+        if (xuYaoQueFei.isEmpty()) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有进行确认操作请勿点击。 ψ(*`ー´)ψ");
         } else {
             //  这个查询是否有重复操作的 sql 需要重新写