核酸黄码列表开发完成

src/main/java/cn/hnthyy/thmz/controller/zd/JcJyController.java

@@ -158,7 +158,7 @@ public class JcJyController {
                 resultMap.put("message", "查询核酸检查（单人单管）列表失败,医嘱码为空");
                 return resultMap;
             }
-            if (!Constants.NUCLEIC_ORDER_CODE.equals(mzYjReq.getOrderCode())) {
+            if (!Arrays.asList(Constants.NUCLEIC_ORDER_CODE,Constants.NUCLEIC_ORDER_ONLY_YELLOW_CODE).contains(mzYjReq.getOrderCode())) {
                 resultMap.put("code", -1);
                 resultMap.put("message", "查询核酸检查（单人单管）列表失败,医嘱码错误错误");
                 return resultMap;

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

@@ -1095,7 +1095,7 @@ public interface MzChargeDetailMapper {
      * @return
      */
     @Select({"<script>",
-            "select top ${pageSize} patient_id,name,tc_name,price_time,times,charge_date FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_charge_detail_page.price_time desc) AS RowNumber,* from mz_charge_detail mz_charge_detail_page WITH(NOLOCK) where charge_item_code =#{orderCode} and pay_mark = '0' and cash_id <![CDATA[<>]]>'99997' ",
+            "select top ${pageSize} rtrim(patient_id) patient_id,name,tc_name,price_time,times,charge_date FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_charge_detail_page.price_time desc) AS RowNumber,* from mz_charge_detail mz_charge_detail_page WITH(NOLOCK) where charge_item_code =#{orderCode} and pay_mark = '0' and cash_id <![CDATA[<>]]>'99997' ",
             "<when test='patientId!=null'>",
             " and patient_id =#{patientId} ",
             "</when>",

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

@@ -234,7 +234,7 @@ public interface MzYjReqMapper {
      * @return
      */
     @Select({"<script>",
-            "select top ${pageSize} req_no,patient_id,p_name patient_name,birth_date,times,receipt_no,order_no,item_no,p_bar_code,group_name,order_code,order_name,page_no,req_comment,req_doctor,",
+            "select top ${pageSize} req_no,rtrim(patient_id) patient_id,p_name patient_name,birth_date,times,receipt_no,order_no,item_no,p_bar_code,group_name,order_code,order_name,page_no,req_comment,req_doctor,",
             "req_ward,exec_dept,req_date,inspect_part,inspect_stuff,sample_status,rtrim(print_flag) print_flag,rtrim(receive_flag) receive_flag,req_type,result_comment,sys_date,",
             "rtrim(pay_mark) pay_mark,rtrim(status_flag) status_flag,serial_no,cash_id,jy_remark,req_other_result,original_list_no,req_tz_comment,rtrim(jz_flag) jz_flag,req_studyid,",
             "percent_ft,rtrim(confirm_flag) confirm_flag,confirm_time,confirm_id,rtrim(print_flag_yj) print_flag_yj FROM (SELECT ROW_NUMBER() OVER (ORDER BY mz_yj_req_page.req_date desc) AS RowNumber,* from mz_yj_req mz_yj_req_page WITH(NOLOCK) where pay_mark='0' and status_flag <![CDATA[<>]]> 'z' ",

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

@@ -52,9 +52,11 @@ function payMarkButtonChange(object) {
 function initHsJcListTable() {
     var typeIndex = getIndex("pay_mark_group");
     if (typeIndex == 0) {
-        initNucleicAcidListTable();
-    } else {
+        initNucleicAcidListTable(queryParams);
+    } else if (typeIndex == 1) {
         initHybridTestListTable();
+    } else {
+        initNucleicAcidListTable(nucleicOnlyYellowAcidQueryParams);
     }
 }
 
@@ -62,7 +64,7 @@ function initHsJcListTable() {
 /**
  * 初始化核酸检查（单人单管）申请列表
  */
-function initNucleicAcidListTable() {
+function initNucleicAcidListTable(queryParams) {
     $('#tb_table_list').bootstrapTable("destroy");
     $('#tb_table_list').bootstrapTable({
         url: '/thmz/getHsJcList', //请求后台的URL（*）
@@ -77,7 +79,7 @@ function initNucleicAcidListTable() {
         sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
         pageNumber: 1,                       //初始化加载第一页，默认第一页
         pageSize: 10,                       //每页的记录行数（*）
-        pageList: [5, 10, 25, 50, 100, 1000, 10000],        //可供选择的每页的行数（*）
+        pageList: [5, 10, 25, 50, 100, 1000, 10000, 100000],        //可供选择的每页的行数（*）
         search: false,                       //是否显示表格搜索，此搜索是客户端搜索，不会进服务端，所以，个人感觉意义不大
         strictSearch: true,
         showColumns: false,                  //是否显示所有的列
@@ -97,14 +99,21 @@ function initNucleicAcidListTable() {
         },
         columns: [
             {
-                field: 'patientId',
-                title: '门诊ID',
+                title: '操作',
                 align: "center",
                 valign: 'middle',
                 formatter: function (value, row, index) {
                     var str = '<button type="button" class="btn btn-primary  btn-sm" onclick="viewHyBirdTest(\'' + row.patientId + '\',' + row.times + ',1)">核酸报告<i class="fa fa-print" style="margin-left: 10px;"></i></button>';
                     return [str].join('');
                 }
+            }, {
+                field: 'patientId',
+                title: '门诊ID',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return "["+value+"]";
+                }
             }, {
                 field: 'patientName',
                 title: '病人姓名',
@@ -169,6 +178,24 @@ function queryParams(params) {
 };
 
 
+/**
+ * 构建列表查询参数(黄码核酸)
+ * @param params
+ * @returns {{mzChargeDetail: {patientId: string | number | string[] | undefined | jQuery, warnDept: string | number | string[] | undefined | jQuery, doctorCode: string | number | string[] | undefined | jQuery, name: string | number | string[] | undefined | jQuery, payMark: number}, beginTime: Date, endTime: Date, pageSize: *, pageIndex: number}}
+ */
+function nucleicOnlyYellowAcidQueryParams(params) {
+    var rePortRangeArr = getRePortRangeArr();
+    return {
+        patientName: $("#cardNo").val(),
+        orderCode: '004764',
+        beginTime: rePortRangeArr[0],
+        endTime: rePortRangeArr[1],
+        pageSize: params.limit,   //页面大小
+        pageIndex: params.offset / params.limit  //页码
+    };
+};
+
+
 /**
  * 初始化核酸检查（混检）申请列表
  */
@@ -187,7 +214,7 @@ function initHybridTestListTable() {
         sidePagination: "server",           //分页方式：client客户端分页，server服务端分页（*）
         pageNumber: 1,                       //初始化加载第一页，默认第一页
         pageSize: 10,                       //每页的记录行数（*）
-        pageList: [5, 10, 25, 50, 100, 1000, 10000],        //可供选择的每页的行数（*）
+        pageList: [5, 10, 25, 50, 100, 1000, 10000, 100000],        //可供选择的每页的行数（*）
         search: false,                       //是否显示表格搜索，此搜索是客户端搜索，不会进服务端，所以，个人感觉意义不大
         strictSearch: true,
         showColumns: false,                  //是否显示所有的列
@@ -207,14 +234,21 @@ function initHybridTestListTable() {
         },
         columns: [
             {
-                field: 'patientId',
-                title: '门诊ID',
+                title: '操作',
                 align: "center",
                 valign: 'middle',
                 formatter: function (value, row, index) {
                     var str = '<button type="button" class="btn btn-primary  btn-sm" onclick="viewHyBirdTest(\'' + row.patientId + '\',' + row.times + ',2)">核酸报告<i class="fa fa-print" style="margin-left: 10px;"></i></button>';
                     return [str].join('');
                 }
+            }, {
+                field: 'patientId',
+                title: '门诊ID',
+                align: "center",
+                valign: 'middle',
+                formatter: function (value, row, index) {
+                    return "["+value+"]";
+                }
             }, {
                 field: 'name',
                 title: '病人姓名',
@@ -379,8 +413,10 @@ function exportExcel() {
     var title = null;
     if (typeIndex == 0) {
         title = "核酸检测（单人单管）列表";
-    } else {
+    } else if(typeIndex == 1) {
         title = "核酸检测（混采）列表";
+    } else {
+        title = "核酸检测（黄码）列表";
     }
 // 传入你的tableId即可导出
     table2excel.export($('#tb_table_list'), title);
@@ -393,11 +429,11 @@ function exportExcel() {
  * @param times 就诊次数
  * @param type 1 单人单管 2 混检
  */
-function viewHyBirdTest(patientId,times,type) {
+function viewHyBirdTest(patientId, times, type) {
     clearInspectionDetail();
     $.ajax({
         type: "GET",
-        url: '/thmz/getHyBridTestByPatentIdAndTimes?patientId=' + patientId+'&times='+times+'&type='+type,
+        url: '/thmz/getHyBridTestByPatentIdAndTimes?patientId=' + patientId + '&times=' + times + '&type=' + type,
         contentType: "application/json;charset=UTF-8",
         dataType: "json",
         headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
@@ -460,7 +496,6 @@ function viewHyBirdTest(patientId,times,type) {
 }
 
 
-
 /**
  * 关闭核酸混检预览弹窗
  */
@@ -470,7 +505,6 @@ function closePreviewYjReqModal() {
 }
 
 
-
 /**
  * 清空检验明细
  * @param orderId
@@ -525,8 +559,6 @@ function setPrint() {
 }
 
 
-
-
 /**
  * 打印检查检验报告单
  * @param printType 打印模式 1 预览打印  2 打印设置

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

@@ -25,6 +25,8 @@
                         </button>
                         <button class="btn btn-sm btn-default" type="button" onclick="payMarkButtonChange(this)">&nbsp;&nbsp;混检&nbsp;&nbsp;
                         </button>
+                        <button class="btn btn-sm btn-default" type="button" onclick="payMarkButtonChange(this)">&nbsp;&nbsp;单人单管(黄码)&nbsp;&nbsp;
+                        </button>
                     </div>
                     <div class="form-group col-md-9 col-sm-9 col-xs-12">
                         <label class="control-label col-md-2 col-sm-2 col-xs-12" for="cardNo">门诊ID/姓名