merge

src/main/java/cn/hnthyy/thmz/controller/mz/MzPatientMiController.java

@@ -208,7 +208,6 @@ public class MzPatientMiController {
      *
      * @return
      */
-    @UserLoginToken
     @RequestMapping(value = "/getBySocialNo", method = {RequestMethod.GET})
     public Map<String, Object> getBySocialNo(@RequestParam("socialNo") String socialNo) {
         Map<String, Object> resultMap = new HashMap<>();

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

@@ -87,6 +87,8 @@ public class MzyReqrec implements Serializable {
     private String paymode;
     //订单号
     private String psordnum;
+    //推荐人
+    private String recStaff;
     //流水号 集合支付的时候保存条形码
     private String agtordnum;
     //发票结算状态 已结帐 1 是  0 否

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

@@ -1266,7 +1266,7 @@ public interface MzChargeDetailMapper {
             "  and a.order_type = '6' " +
             "  and b.patient_id = #{patientId}" +
             "  and b.times = #{times}")
-    List<MzChargeDetail> selectYjEntryCharge(String patientId, Integer times);
+    List<MzChargeDetail> selectYjEntryCharge(@Param("patientId") String patientId, @Param("times") Integer times);
     @Select(" select distinct a.patient_id, b.times " +
             " from mz_order_detail a, " +
             "     mz_charge_detail b " +

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

@@ -22,14 +22,14 @@ 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,par_channel,trans_date,trace_no)" +
+                    "paymode,psordnum,agtordnum,bl_fee,ck_fee,print_closing_date,print_dcount_no,web_id,zlk_fee,blb_fee,par_channel,trans_date,trace_no,rec_staff)" +
             " 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},#{parChannel,jdbcType=VARCHAR},#{transDate,jdbcType=VARCHAR},#{traceNo,jdbcType=VARCHAR})"
+                    "#{blbFee,jdbcType=DOUBLE},#{parChannel,jdbcType=VARCHAR},#{transDate,jdbcType=VARCHAR},#{traceNo,jdbcType=VARCHAR},#{recStaff,jdbcType=VARCHAR})"
             ,"</script>"})
     int insertMzyReqrec(MzyReqrec mzyReqrec);
 
@@ -113,7 +113,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,par_channel,trans_date,trace_no   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,trans_date,trace_no,rec_staff   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 ",
@@ -210,7 +210,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,par_channel,trans_date,trace_no   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,trans_date,trace_no,rec_staff   from dbo.mzy_reqrec WITH(NOLOCK) where cancel_mark=1",
             "</script>"})
     List<MzyReqrec> selectAllCancel();
 
@@ -277,7 +277,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,par_channel,trans_date,trace_no   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,trans_date,trace_no,rec_staff   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);
 
@@ -305,7 +305,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,par_channel,trans_date,trace_no   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,trans_date,trace_no,rec_staff   from dbo.mzy_reqrec WITH(NOLOCK) where serial_no = #{serialNo}",
             "</script>"})
     MzyReqrec selectMzyReqrecBySerialNo(@Param("serialNo") Integer serialNo);
 

src/main/java/cn/hnthyy/thmz/service/impl/his/mz/MzyReqrecServiceImpl.java

@@ -159,7 +159,7 @@ public class MzyReqrecServiceImpl implements MzyReqrecService {
         Windows windows = null;
         if (PayMarkEnum.CHARGED.code.equals(mzyReqrecPageDto.getPayMark())) {
             windows = windowsMapper.selectLastWindowsByIpAddress(ipAddress);
-            if (windows == null) {
+            if (!Constants.BRZZJF_CODE.equals(ipAddress) && windows == null) {
                 throw new MzException("当前操作人未设置窗口号，请先设置！");
             }
         }

src/main/resources/otherSource/update_table.sql

@@ -2289,3 +2289,14 @@ go
 
 --新增处方类型 20250709
 insert into mz_zd_order_type (code, name, py_code, d_code, del_flag) values ('6','医技录入处方','YJLRCF','YJLRCF','0')
+
+--挂号记录 新增推荐人 20250718
+alter table mzy_reqrec
+    add rec_staff varchar(100)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'推荐人编码', 'SCHEMA', 'dbo', 'TABLE', 'mzy_reqrec', 'COLUMN',
+     'rec_staff'
+go
+
+

src/main/resources/static/js/mz/yj_item_entry.js

@@ -474,8 +474,8 @@ function saveYjItem() {
             unitPrice:rightData[i].zlItemPrice,
             origPrice:rightData[i].zlItemPrice,
             chargeItemCode:rightData[i].zlCode,
-            quantity:rightData[i].itemQuantity,
-            drugQuan:rightData[i].drugQuan,
+            quantity:rightData[i].totalNumZl,
+            drugQuan:rightData[i].itemQuantity,
             instructionText:rightData[i].remark,
             execDept:rightData[i].execUnit,
             frequency:rightData[i].orderFrequencyZl,
@@ -502,6 +502,7 @@ function saveYjItem() {
                 clearData()
                 clearPatient()
                 $("#patientIdParam").val(null)
+                $("#totalCharge").text(0)
                 rightData = []
                 loadRightTable()
             },2000)

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

@@ -156,7 +156,7 @@
                 <div class="col-md-6 col-sm-6 col-xs-12">
                     <table id="dataTable"></table>
                     <div  style="width: 100%;text-align: right;font-weight: bold" >
-                       <span>总计金额:</span> <span id="totalCharge">120</span>元
+                       <span>总计金额:</span> <span id="totalCharge">0</span>元
                     </div>
                 </div>
             </div>