|  | @@ -35,6 +35,15 @@ $(function () {
 | 
	
		
			
				|  |  |      $("#btn_ty").click(function (t) {
 | 
	
		
			
				|  |  |          saveRefundMedicine();
 | 
	
		
			
				|  |  |      });
 | 
	
		
			
				|  |  | +    $("#sendDispose").click(function (t) {
 | 
	
		
			
				|  |  | +        let orderNo = $("#orderNoLabel").val();
 | 
	
		
			
				|  |  | +        let receiptNo = $("#receiptNoLabel").val();
 | 
	
		
			
				|  |  | +        let times = $("#timesLabel").val();
 | 
	
		
			
				|  |  | +        let name = $("#nameLabel").val();
 | 
	
		
			
				|  |  | +        let patientId = $("#patientIdLabel").val();
 | 
	
		
			
				|  |  | +        let realNo = $("#realNoLabel").val();
 | 
	
		
			
				|  |  | +        sendMedicineProcessing(realNo, 71, orderNo, receiptNo, times, patientId, name);
 | 
	
		
			
				|  |  | +    });
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      $(".selectpicker").selectpicker({
 | 
	
		
			
				|  |  |          dropuAuto: false
 | 
	
	
		
			
				|  | @@ -125,9 +134,9 @@ function sendRefundButtonChange(object, realIndex) {
 | 
	
		
			
				|  |  |   * 发药处理
 | 
	
		
			
				|  |  |   */
 | 
	
		
			
				|  |  |  function sendMedicineProcessing(realNo, groupNo, orderNo, receiptNo, times, patientId, name) {
 | 
	
		
			
				|  |  | -    if (!confirm("确定要对当前处方进行发药处理吗?")) {
 | 
	
		
			
				|  |  | +    /*if (!confirm("确定要对当前处方进行发药处理吗?")) {
 | 
	
		
			
				|  |  |          return;
 | 
	
		
			
				|  |  | -    }
 | 
	
		
			
				|  |  | +    }*/
 | 
	
		
			
				|  |  |      var temp = {
 | 
	
		
			
				|  |  |          groupNo: groupNo,
 | 
	
		
			
				|  |  |          realNo: realNo,
 | 
	
	
		
			
				|  | @@ -152,6 +161,7 @@ function sendMedicineProcessing(realNo, groupNo, orderNo, receiptNo, times, pati
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              if (res.code == 0) {
 | 
	
		
			
				|  |  |                  successMesage(res);
 | 
	
		
			
				|  |  | +                $('#cfxxModal').modal('hide');
 | 
	
		
			
				|  |  |                  initTbTable();
 | 
	
		
			
				|  |  |              } else {
 | 
	
		
			
				|  |  |                  errorMesage(res);
 | 
	
	
		
			
				|  | @@ -186,8 +196,8 @@ function initTbTable() {
 | 
	
		
			
				|  |  |          queryParams: queryParams,           //传递参数(*)
 | 
	
		
			
				|  |  |          sidePagination: "server",           //分页方式:client客户端分页,server服务端分页(*)
 | 
	
		
			
				|  |  |          pageNumber: 1,                       //初始化加载第一页,默认第一页
 | 
	
		
			
				|  |  | -        pageSize: 10,                       //每页的记录行数(*)
 | 
	
		
			
				|  |  | -        pageList: [10, 25, 50, 100],        //可供选择的每页的行数(*)
 | 
	
		
			
				|  |  | +        pageSize: 15,                       //每页的记录行数(*)
 | 
	
		
			
				|  |  | +        pageList: [20, 25, 50, 100],        //可供选择的每页的行数(*)
 | 
	
		
			
				|  |  |          search: false,                       //是否显示表格搜索,此搜索是客户端搜索,不会进服务端,所以,个人感觉意义不大
 | 
	
		
			
				|  |  |          singleSelect: true,           // 单选checkbox
 | 
	
		
			
				|  |  |          strictSearch: true,
 | 
	
	
		
			
				|  | @@ -215,12 +225,12 @@ function initTbTable() {
 | 
	
		
			
				|  |  |                  formatter: function (value, row, index) {
 | 
	
		
			
				|  |  |                      var str = "";
 | 
	
		
			
				|  |  |                      if (sendRefundGroup == 0) {
 | 
	
		
			
				|  |  | -                        str = '<button type="button" class="registration-no-color-foot-button" title="打印" onclick="printInjectionOralMedicine(\'' + row.patientId + '\',\'' + row.orderNo + '\',\'' + row.realNo + '\',\'' + row.times + '\',\'' + row.receiptNo + '\');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
 | 
	
		
			
				|  |  | +                        str = '<button type="button" class="registration-no-color-foot-button" title="打印" onclick="printInjectionOralMedicine(\'' + row.patientId + '\',\'' + row.orderNo + '\',\'' + row.realNo + '\',\'' + row.times + '\',\'' + row.receiptNo + '\',\'' + row.confirmFlag + '\');" style="color: #35D082;"><i class="fa fa-print"></i></button>';
 | 
	
		
			
				|  |  |                          str += '<button type="button" class="registration-no-color-foot-button" title="叫号" onclick="callNumber(\'' + row.patientId + '\',\'' + row.name + '\')"><i class="glyphicon glyphicon-bullhorn"></i></button>';
 | 
	
		
			
				|  |  |                          if(row.confirmFlag ==5 || row.confirmFlag ==0){
 | 
	
		
			
				|  |  |                              str += '<button type="button" class="registration-no-color-foot-button" title="发药" onclick="sendMedicineProcessing(\'' + row.realNo + '\',\'' + 71 + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\',\'' + row.name + '\')"><i class="fa fa-check-square-o"></i></button>';
 | 
	
		
			
				|  |  |                          }
 | 
	
		
			
				|  |  | -                        str += '<button type="button" class="registration-no-color-foot-button" title="详细" onclick="prescriptionDetail(\'' + row.realNo + '\',\'' + 71 + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\')"><i class="fa fa-plus"></i></button>';
 | 
	
		
			
				|  |  | +                        str += '<button type="button" class="registration-no-color-foot-button" title="详细" onclick="prescriptionDetail(\'' + row.realNo + '\',\'' + 71 + '\',\'' + row.orderNo + '\',\'' + row.receiptNo + '\',\'' + row.times + '\',\'' + row.patientId + '\',\'' + row.confirmFlag + '\')"><i class="fa fa-plus"></i></button>';
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  |                      return str;
 | 
	
		
			
				|  |  |                  }
 | 
	
	
		
			
				|  | @@ -316,7 +326,7 @@ function initTbTable() {
 | 
	
		
			
				|  |  |          },
 | 
	
		
			
				|  |  |          onDblClickRow: function (row) {
 | 
	
		
			
				|  |  |              if (sendRefundGroup == 0) {
 | 
	
		
			
				|  |  | -                printInjectionOralMedicine(row.patientId, row.orderNo, row.realNo, row.times, row.receiptNo);
 | 
	
		
			
				|  |  | +                printInjectionOralMedicine(row.patientId, row.orderNo, row.realNo, row.times, row.receiptNo,row.confirmFlag);
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          },
 | 
	
		
			
				|  |  |          responseHandler: function (res) {
 | 
	
	
		
			
				|  | @@ -619,7 +629,8 @@ function sendMedicineProcessingRad() {
 | 
	
		
			
				|  |  |  /**
 | 
	
		
			
				|  |  |   * 打印注射卡口服药品
 | 
	
		
			
				|  |  |   */
 | 
	
		
			
				|  |  | -function printInjectionOralMedicine(patientId, orderNo, realNo, times, receiptNo) {
 | 
	
		
			
				|  |  | +function printInjectionOralMedicine(patientId, orderNo, realNo, times, receiptNo,confirmFlag) {
 | 
	
		
			
				|  |  | +    prescriptionDetail(realNo, 71, orderNo, receiptNo, times, patientId,confirmFlag);
 | 
	
		
			
				|  |  |      var tem = {
 | 
	
		
			
				|  |  |          patientId: patientId,
 | 
	
		
			
				|  |  |          orderNo: orderNo,
 | 
	
	
		
			
				|  | @@ -901,7 +912,8 @@ function queryParams(params) {
 | 
	
		
			
				|  |  |          confirmFlag: $("#confirmFlagSearch").val(),
 | 
	
		
			
				|  |  |          realNo: $("#realNoSearch").val() == "" ? null : $("#realNoSearch").val(),
 | 
	
		
			
				|  |  |          groupNoOut: '71',
 | 
	
		
			
				|  |  | -        isSendAndMatch: $('#sendAndMatch').prop('checked')?1:0
 | 
	
		
			
				|  |  | +        isSendAndMatch: 1
 | 
	
		
			
				|  |  | +        /*isSendAndMatch: $('#sendAndMatch').prop('checked')?1:0*/
 | 
	
		
			
				|  |  |      };
 | 
	
		
			
				|  |  |      return temp;
 | 
	
		
			
				|  |  |  };
 | 
	
	
		
			
				|  | @@ -938,7 +950,7 @@ function cleanParams() {
 | 
	
		
			
				|  |  |      $('#reportrange span').html(moment().format('YYYY-MM-DD') + ' - ' + moment().format('YYYY-MM-DD'));
 | 
	
		
			
				|  |  |      $("#nameSearch").val(null);
 | 
	
		
			
				|  |  |      $("#patientId_or_cardNo").val(null);
 | 
	
		
			
				|  |  | -    $("#patientIdSearch").val(null);
 | 
	
		
			
				|  |  | +    $("#patientId").val(null);
 | 
	
		
			
				|  |  |      $("#realNoSearch").val(null);
 | 
	
		
			
				|  |  |      var sendRefundGroup = getIndex("send_refund_group");
 | 
	
		
			
				|  |  |      sendRefundGroup == 0 ? $("#confirmFlagSearch").selectpicker('val', 0) : $("#confirmFlagSearch").selectpicker('val', 2);
 | 
	
	
		
			
				|  | @@ -952,7 +964,12 @@ function cleanParams() {
 | 
	
		
			
				|  |  |   */
 | 
	
		
			
				|  |  |  var $table;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  | -function prescriptionDetail(realNo, groupNo, orderNo, receiptNo, times, patientId) {
 | 
	
		
			
				|  |  | +function prescriptionDetail(realNo, groupNo, orderNo, receiptNo, times, patientId,confirmFlag) {
 | 
	
		
			
				|  |  | +    if(confirmFlag ==5 || confirmFlag ==0){
 | 
	
		
			
				|  |  | +        $("#sendDispose").show();//显示
 | 
	
		
			
				|  |  | +    }else{
 | 
	
		
			
				|  |  | +        $("#sendDispose").hide();//隐藏
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |      var temp = {
 | 
	
		
			
				|  |  |          groupNo: groupNo,
 | 
	
		
			
				|  |  |          realNo: realNo,
 | 
	
	
		
			
				|  | @@ -1097,6 +1114,12 @@ function prescriptionDetail(realNo, groupNo, orderNo, receiptNo, times, patientI
 | 
	
		
			
				|  |  |                  $("#warnDeptNameLabel").val(ress.data[0].warnDeptName);
 | 
	
		
			
				|  |  |                  $("#chargeDateLabel").val(format(ress.data[0].chargeDate, "yyyy-MM-dd HH:mm:ss"));
 | 
	
		
			
				|  |  |                  $("#icdTextLabel").val(ress.data[0].icdText);
 | 
	
		
			
				|  |  | +                $("#orderNoLabel").val(ress.data[0].orderNo);
 | 
	
		
			
				|  |  | +                $("#receiptNoLabel").val(ress.data[0].receiptNo);
 | 
	
		
			
				|  |  | +                $("#timesLabel").val(ress.data[0].times);
 | 
	
		
			
				|  |  | +                $("#nameLabel").val(ress.data[0].name);
 | 
	
		
			
				|  |  | +                $("#patientIdLabel").val(ress.data[0].patientId);
 | 
	
		
			
				|  |  | +                $("#realNoLabel").val(ress.data[0].realNo);
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              if (ress.code == -1) {
 | 
	
		
			
				|  |  |                  if (ress.message != null && ress.message != '') {
 |