只能pos功能暂存

src/main/java/cn/hnthyy/thmz/entity/his/mz/MzDepositFile.java

@@ -58,6 +58,8 @@ public class MzDepositFile extends PageBean implements Serializable {
     private Long contractId;
     //付款方式名称
     private String chequeTypeName;
+    //判断是否是数字人民币支付
+    private String parChannel;
     public MzDepositFile() {
     }
     public MzDepositFile(String patientId, Integer times) {

src/main/java/cn/hnthyy/thmz/entity/his/mz/MzyReqrec.java

@@ -92,6 +92,8 @@ public class MzyReqrec implements Serializable {
     private Integer printDcountNo;
     //发票结帐日期
     private Date printClosingDate;
+    //判断是否是数字人民币支付
+    private String parChannel;
     //挂号日期字符串格式  yyyy-MM-dd 格式
     private String requestDayStr;
 

src/main/java/cn/hnthyy/thmz/mapper/his/mz/MzyReqrecMapper.java

@@ -22,13 +22,13 @@ public interface MzyReqrecMapper {
             "</when>",
             "INSERT INTO mzy_reqrec(patient_id,times,name,req_type,request_day,ampm,unit_code,group_code,doctor_code,charge_type,req_order,req_fee,oth_fee,cancel_mark,admiss_time,op_id," +
             "op_day,clinic_fee,visited_mark,plus_mark,closing_date,printer_id,print_flag,windows_no,serial_no,receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,visit_doctor,visit_date," +
-                    "paymode,psordnum,agtordnum,bl_fee,ck_fee,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee)" +
+                    "paymode,psordnum,agtordnum,bl_fee,ck_fee,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee,par_channel)" +
             " VALUES (#{patientId,jdbcType=CHAR},#{times,jdbcType=INTEGER},#{name,jdbcType=CHAR},#{reqType,jdbcType=CHAR},#{requestDay,jdbcType=TIMESTAMP},#{ampm,jdbcType=CHAR}," +
             "#{unitCode,jdbcType=CHAR},#{groupCode,jdbcType=CHAR},#{doctorCode,jdbcType=CHAR},#{chargeType,jdbcType=CHAR},#{reqOrder,jdbcType=INTEGER},#{reqFee,jdbcType=DOUBLE}," +
             "#{othFee,jdbcType=DOUBLE},#{cancelMark,jdbcType=CHAR},#{admissTime,jdbcType=CHAR},#{opId,jdbcType=CHAR},#{opDay,jdbcType=TIMESTAMP},#{clinicFee,jdbcType=DOUBLE},#{visitedMark,jdbcType=CHAR},#{plusMark,jdbcType=CHAR}," +
             "#{closingDate,jdbcType=TIMESTAMP},#{printerId,jdbcType=CHAR},#{printFlag,jdbcType=CHAR},#{windowsNo,jdbcType=CHAR},#{serialNo,jdbcType=INTEGER},#{receiptBill,jdbcType=CHAR},#{dcountNo,jdbcType=INTEGER}," +
             "#{brochureFee,jdbcType=DOUBLE},#{deptNo,jdbcType=VARCHAR},#{visitDept,jdbcType=VARCHAR},#{visitDoctor,jdbcType=VARCHAR},#{visitDate,jdbcType=TIMESTAMP},#{paymode,jdbcType=VARCHAR}," +
-            "#{psordnum,jdbcType=VARCHAR},#{agtordnum,jdbcType=VARCHAR},0.00,0.00,#{printClosingDate,jdbcType=TIMESTAMP},#{printDcountNo,jdbcType=INTEGER},#{webId,jdbcType=CHAR},#{zlkFee,jdbcType=DOUBLE},#{blbFee,jdbcType=DOUBLE})"
+            "#{psordnum,jdbcType=VARCHAR},#{agtordnum,jdbcType=VARCHAR},0.00,0.00,#{printClosingDate,jdbcType=TIMESTAMP},#{printDcountNo,jdbcType=INTEGER},#{webId,jdbcType=CHAR},#{zlkFee,jdbcType=DOUBLE},#{blbFee,jdbcType=DOUBLE},#{parChannel,jdbcType=VARCHAR})"
             ,"</script>"})
     int insertMzyReqrec(MzyReqrec mzyReqrec);
 
@@ -112,7 +112,7 @@ public interface MzyReqrecMapper {
             "rtrim(group_code) group_code,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,req_order,req_fee,oth_fee,rtrim(cancel_mark) cancel_mark,",
             "rtrim(admiss_time) admiss_time,rtrim(op_id) op_id,op_day,clinic_fee,rtrim(visited_mark) visited_mark,rtrim(plus_mark) plus_mark,closing_date,",
             "rtrim(printer_id) printer_id,rtrim(print_flag) print_flag,rtrim(windows_no) windows_no,serial_no,rtrim(receipt_bill) receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,",
-            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee   FROM (SELECT ROW_NUMBER() OVER (ORDER BY mzy_reqrec_page.request_day desc) AS RowNumber,",
+            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee,par_channel   FROM (SELECT ROW_NUMBER() OVER (ORDER BY mzy_reqrec_page.request_day desc) AS RowNumber,",
             "* from dbo.${tableName} mzy_reqrec_page WITH(NOLOCK) where times >0 ",
             "<when test='patientIds!=null'>",
             " and patient_id in ",
@@ -197,7 +197,7 @@ public interface MzyReqrecMapper {
             "rtrim(group_code) group_code,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,req_order,req_fee,oth_fee,rtrim(cancel_mark) cancel_mark,",
             "rtrim(admiss_time) admiss_time,rtrim(op_id) op_id,op_day,clinic_fee,rtrim(visited_mark) visited_mark,rtrim(plus_mark) plus_mark,closing_date,",
             "rtrim(printer_id) printer_id,rtrim(print_flag) print_flag,rtrim(windows_no) windows_no,serial_no,rtrim(receipt_bill) receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,",
-            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee   from dbo.mzy_reqrec WITH(NOLOCK) where cancel_mark=1",
+            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee,par_channel   from dbo.mzy_reqrec WITH(NOLOCK) where cancel_mark=1",
             "</script>"})
     List<MzyReqrec> selectAllCancel();
 
@@ -234,6 +234,9 @@ public interface MzyReqrecMapper {
             "<when test='visitedMark!=null'>",
             ",visited_mark =#{visitedMark}",
             "</when>",
+            "<when test='parChannel!=null'>",
+            ",par_channel =#{parChannel}",
+            "</when>",
             "</trim>"
             , "</script>"})
     int updateMzyReqrec(MzyReqrec mzyReqrec);
@@ -261,7 +264,7 @@ public interface MzyReqrecMapper {
             "rtrim(group_code) group_code,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,req_order,req_fee,oth_fee,rtrim(cancel_mark) cancel_mark,",
             "rtrim(admiss_time) admiss_time,rtrim(op_id) op_id,op_day,clinic_fee,rtrim(visited_mark) visited_mark,rtrim(plus_mark) plus_mark,closing_date,",
             "rtrim(print_flag) print_flag,rtrim(windows_no) windows_no,serial_no,rtrim(receipt_bill) receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,",
-            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee   from ${tableName} WITH(NOLOCK) where patient_id=#{patientId,jdbcType=CHAR} and times = #{times,jdbcType=INTEGER}",
+            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee,par_channel   from ${tableName} WITH(NOLOCK) where patient_id=#{patientId,jdbcType=CHAR} and times = #{times,jdbcType=INTEGER}",
             "</script>"})
     MzyReqrec selectMzyReqrecByPatientIdAndTimes(@Param("patientId") String patientId, @Param("times") Integer times,@Param("tableName") String tableName);
 
@@ -277,7 +280,7 @@ public interface MzyReqrecMapper {
             "rtrim(group_code) group_code,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,req_order,req_fee,oth_fee,rtrim(cancel_mark) cancel_mark,",
             "rtrim(admiss_time) admiss_time,rtrim(op_id) op_id,op_day,clinic_fee,rtrim(visited_mark) visited_mark,rtrim(plus_mark) plus_mark,closing_date,",
             "rtrim(print_flag) print_flag,rtrim(windows_no) windows_no,serial_no,rtrim(receipt_bill) receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,",
-            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee   from dbo.mzy_reqrec WITH(NOLOCK) where serial_no = #{serialNo}",
+            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee,par_channel   from dbo.mzy_reqrec WITH(NOLOCK) where serial_no = #{serialNo}",
             "</script>"})
     MzyReqrec selectMzyReqrecBySerialNo(@Param("serialNo") Integer serialNo);
 
@@ -367,7 +370,7 @@ public interface MzyReqrecMapper {
             "rtrim(group_code) group_code,rtrim(doctor_code) doctor_code,rtrim(charge_type) charge_type,req_order,req_fee,oth_fee,rtrim(cancel_mark) cancel_mark,"+
             "rtrim(admiss_time) admiss_time,rtrim(op_id) op_id,op_day,clinic_fee,rtrim(visited_mark) visited_mark,rtrim(plus_mark) plus_mark,closing_date,"+
             "rtrim(printer_id) printer_id,rtrim(print_flag) print_flag,rtrim(windows_no) windows_no,serial_no,rtrim(receipt_bill) receipt_bill,dcount_no,brochure_fee,dept_no,visit_dept,"+
-            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee   from dbo.${tableName} WITH(NOLOCK) where psordnum=#{psordnum} and cancel_mark =0 ",
+            "visit_doctor,visit_date,paymode,psordnum,agtordnum,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee,par_channel   from dbo.${tableName} WITH(NOLOCK) where psordnum=#{psordnum} and cancel_mark =0 ",
             "<when test='agtordnum!=null'>",
             " and agtordnum = #{agtordnum}",
             "</when>",

src/main/java/cn/hnthyy/thmz/service/impl/thmz/TransactionServiceImpl.java

@@ -71,7 +71,7 @@ public class TransactionServiceImpl implements TransactionService {
         if(Constants.YLK.equals(chequeType)){
             type= "消费";
             realUrl = misPossUrl + "consume";
-        }else if(Constants.WX.equals(chequeType) || Constants.ZFB.equals(chequeType)){
+        }else if(Constants.JHZF.equals(chequeType)){
             type= "聚合支付";
             realUrl = misPossUrl + "onlinePayment";
             map.put("qrCodeParam", "");

src/main/resources/templates/mz/registration.html

@@ -461,6 +461,7 @@
                 <!--<div style="float: left;margin-left: 10px;">-->
                 <!--<input type="checkbox"/>&nbsp;&nbsp;打印-->
                 <!--</div>-->
+                <button type="button" class="btn btn-primary" id="consume">刷卡/扫码</button>
                 <button type="button" class="btn btn-primary" id="saveConfirmFee">确定</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
             </div>