返回门诊卡号

src/main/java/thyyxxk/webserver/dao/his/medicaladvice/medicamanage/MedicalManagementDao.java

@@ -138,7 +138,7 @@ public interface MedicalManagementDao {
             "        a.admiss_times = c.admiss_times  and\n" +
             "        a.group_no     <> '00'      and\n" +
             "        a.doctor_flag='1'\n" +
-            "order by page_no,confirm_time,act_order_no_b,act_order_no")
+            "order by act_order_no,page_no,confirm_time,act_order_no_b")
     List<YzPrintVO> getcqYzPrint(@Param("patNo") String patNo, @Param("times")Integer times,@Param("pageCondition")String pageCondition,@Param("tableName")String tableName);
     @Select("SELECT act_order_no=a.act_order_no,\n" +
             "              inpatient_no=a.inpatient_no,\n" +
@@ -325,7 +325,7 @@ public interface MedicalManagementDao {
             "        a.doctor_flag='1' and\n" +
             "        a.group_no = '00' and\n" +
             "    (a.order_name like '%草药%' or a.order_name like '%会诊%')\n" +
-            "order by page_no,confirm_time,act_order_no_b")
+            "order by act_order_no_b,page_no,confirm_time")
     List<YzPrintVO> getlsYzPrint(@Param("patNo") String patNo, @Param("times")Integer times,@Param("pageCondition")String pageCondition,@Param("tableName") String tableName);
     @Select("select\n" +
             "                   RTRIM(a.bed_no) bedNo,\n" +

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/SiQueryDao.java

@@ -144,7 +144,7 @@ public interface SiQueryDao {
     String selectAdmdvsByPatNoAndPsnNo(String patNo, String psnNo);
 
     @Select("select a.mdtrt_id,a.psn_name,a.gend,a.age,a.psn_no,b.emp_name,a.psn_type,a.cvlserv_flag,a.pat_no," +
-            "a.setl_id,b.insuplc_admdvs,a.med_type,a.setl_time,a.hifes_pay,a.insutype,a.fulamt_ownpay_amt,a.overlmt_selfpay,a.preselfpay_amt,a.inscp_scp_amt, " +
+            "a.setl_id,b.insuplc_admdvs,a.med_type,a.setl_time,a.hifes_pay,a.insutype,a.fulamt_ownpay_amt,a.overlmt_selfpay,a.preselfpay_amt,a.inscp_scp_amt,c.mz_no, " +
             "tel=(select rtrim(home_tel) from a_patient_mi where a_patient_mi.inpatient_no=a.pat_no), " +
             "admDeptName=(select rtrim(name) from zd_unit_code where code=isnull(c.zk_ward,c.small_dept)), " +
             "c.bed_no as admBed,a.begntime,a.endtime,a.certno,a.mdtrt_cert_type,b.psn_idet_type, " +

src/main/java/thyyxxk/webserver/entity/medicalinsurance/setllist/InptntSetlmtLst.java

@@ -248,4 +248,9 @@ public class InptntSetlmtLst {
      * 全自费金额
      */
     private BigDecimal fulamtOwnpayAmt;
+
+    /**
+     * 门诊卡号
+     */
+    private String mzNo;
 }