Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/dao/his/medicaladvice/nursing/NursingManagementDao.java

@@ -211,15 +211,14 @@ public interface NursingManagementDao {
          "    ( yz_act_order.inpatient_no = zy_actpatient.inpatient_no ) and" +
          "    ( yz_act_order.admiss_times = zy_actpatient.admiss_times ) and" +
          "    ( yz_act_order.status_flag > '1' ) AND" +
-         "    ( zy_actpatient.dept like '8000002' ) AND" +
-         "    ( zy_actpatient.ward = '8000002' ) AND" +
+         "    ( zy_actpatient.ward = #{curWard} ) AND" +
          "        zy_actpatient.bed_no >= cast(#{startBedNo} as float) and zy_actpatient.bed_no <=cast( #{endBedNo} as float) and" +
          "        yz_act_order.frequ_code  <> ''  and" +
          "       ${psOperCondition}  and" +
          "        yz_act_order.order_code = yp_zd_dict.code and" +
          "        yz_act_order.serial = yp_zd_dict.serial and" +
          "    (yz_supply_type.ps_flag='1' or yz_supply_type.ps_flag='0') order by cast(bed_no as float) ")
- List<PsInfoVO> listPsInfo(String startBedNo, String endBedNo, String psOperCondition);
+ List<PsInfoVO> listPsInfo(String startBedNo, String endBedNo, String curWard,String psOperCondition);
     /**
      * @description:更新皮试信息
      * @author: lihong

src/main/java/thyyxxk/webserver/entity/medicaladvice/medicamanage/PsInfoVO.java

@@ -42,6 +42,7 @@ public class PsInfoVO {
     /** 查询条件   */
     private String startBedNo;
     private String endBedNo;
+    private String curWard;
     /** 确认标识 0 未确认 1已确认  */
     private Integer confirmFlag;
 

src/main/java/thyyxxk/webserver/service/medicaladvice/nursing/NursingManagementService.java

@@ -303,7 +303,7 @@ public class NursingManagementService {
         }else {
             psOperCondition = " isnull(ps_oper,'') <>''";
         }
-       List<PsInfoVO> psInfoVOS = dao.listPsInfo(psInfoVO.getStartBedNo(), psInfoVO.getEndBedNo(), psOperCondition);
+       List<PsInfoVO> psInfoVOS = dao.listPsInfo(psInfoVO.getStartBedNo(), psInfoVO.getEndBedNo(),psInfoVO.getCurWard(), psOperCondition);
         return psInfoVOS;
    }