|  | @@ -25,7 +25,7 @@ $(function () {
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |      if (groupNo == null) {
 | 
	
		
			
				|  |  |          return errorMesageSimaple('当前药房未设置,请在发药参数设置中设置');
 | 
	
		
			
				|  |  | -    } else if (groupNo === '81') {
 | 
	
		
			
				|  |  | +    } else if (groupNo === '81' || groupNo ==='83') {
 | 
	
		
			
				|  |  |          $('.isXy').css('display', 'none');
 | 
	
		
			
				|  |  |          $('.isZy').css('display', '');
 | 
	
		
			
				|  |  |          $('#mx').css('display', 'none');
 | 
	
	
		
			
				|  | @@ -45,7 +45,7 @@ $(function () {
 | 
	
		
			
				|  |  |      clearInterval(tableInterval);
 | 
	
		
			
				|  |  |      //五分钟刷新一次请领单列表数据
 | 
	
		
			
				|  |  |      tableInterval = setInterval(function (){
 | 
	
		
			
				|  |  | -        if((groupNo !== '81' && $("#submitFlagSearch").val() === "1") || (groupNo === '81' && $("#submitFlagSearch").val() === "3")){
 | 
	
		
			
				|  |  | +        if((groupNo !== '81' && groupNo !== '83' && $("#submitFlagSearch").val() === "1") || ((groupNo === '81' || groupNo === '83') && $("#submitFlagSearch").val() === "3")){
 | 
	
		
			
				|  |  |              initTbTable()
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |      }, 50000);
 | 
	
	
		
			
				|  | @@ -185,7 +185,7 @@ function initButtonChange(object, realIndex) {
 | 
	
		
			
				|  |  |          $("#pageClassSearch").val(searchData.pageClass);
 | 
	
		
			
				|  |  |          $("#wardCode").val(searchData.wardCode);
 | 
	
		
			
				|  |  |          if (searchData.submitFlag == null) {
 | 
	
		
			
				|  |  | -            groupNo === '81' ?$("#submitFlagSearch").val(3):$("#submitFlagSearch").val(1);
 | 
	
		
			
				|  |  | +            (groupNo === '81' || groupNo === '83') ?$("#submitFlagSearch").val(3):$("#submitFlagSearch").val(1);
 | 
	
		
			
				|  |  |          } else {
 | 
	
		
			
				|  |  |              $("#submitFlagSearch").val(searchData.submitFlag);
 | 
	
		
			
				|  |  |          }
 | 
	
	
		
			
				|  | @@ -214,7 +214,7 @@ function initButtonChange(object, realIndex) {
 | 
	
		
			
				|  |  |          loadDetailTable();
 | 
	
		
			
				|  |  |          let ps = $("#pageClassSearch").val();
 | 
	
		
			
				|  |  |          // 不是已发药状态或者是中药房不能手动使用摆药机
 | 
	
		
			
				|  |  | -        if("3" != $("#submitFlagSearch").val() || groupNo === '81'){
 | 
	
		
			
				|  |  | +        if("3" !== $("#submitFlagSearch").val() || groupNo === '81' || groupNo === '83'){
 | 
	
		
			
				|  |  |              $("#btn_byj").css('display', 'none');
 | 
	
		
			
				|  |  |          } else if("5" === ps || "6" === ps){
 | 
	
		
			
				|  |  |              $("#btn_byj").css('display', "inline-flex");
 | 
	
	
		
			
				|  | @@ -382,11 +382,11 @@ function initColumns() {
 | 
	
		
			
				|  |  |          valign: 'middle',
 | 
	
		
			
				|  |  |          formatter: function (value, row, index) {
 | 
	
		
			
				|  |  |              var str = '<button type="button" class="registration-no-color-foot-button" title="药单详细" onclick="detail(\'' + row.pageNo + '\',\'' + row.pageClass + '\',\'' + row.wardCode + '\',0)"><i class="fa fa-plus"></i></button>';
 | 
	
		
			
				|  |  | -            if (groupNo !== '81' && $("#submitFlagSearch").val() === '1' && row.pageClass != 'T' && row.pageClass != 'HT' && row.pageClass != 'A' && row.pageClass != '5' && row.pageClass != '6') {
 | 
	
		
			
				|  |  | +            if ((groupNo !== '81' && groupNo !== '83') && $("#submitFlagSearch").val() === '1' && row.pageClass != 'T' && row.pageClass != 'HT' && row.pageClass != 'A' && row.pageClass != '5' && row.pageClass != '6') {
 | 
	
		
			
				|  |  |                  str += '<button type="button" class="registration-no-color-foot-button" title="病室药单汇总" onclick="detail(\'' + row.pageNo + '\',\'' + row.pageClass + '\',\'' + row.wardCode + '\',1)"><i class="fa fa-compress"></i></button>';
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  | -            if ((groupNo !== '81' && $("#submitFlagSearch").val() === '1') || (groupNo === '81' && $("#submitFlagSearch").val() === '3')) {
 | 
	
		
			
				|  |  | -                str += '<button type="button" class="registration-no-color-foot-button" title="撤销提交" onclick="cancelSubmit(\'' + row.pageNo + '\',\'' + row.wardName + '\',\'' + row.pageClass + '\')"><i class="fa fa-reply"></i></button>';
 | 
	
		
			
				|  |  | +            if (((groupNo !== '81' && groupNo !== '83') && $("#submitFlagSearch").val() === '1') || ((groupNo === '81' || groupNo === '83') && $("#submitFlagSearch").val() === '3')) {
 | 
	
		
			
				|  |  | +                str += '<button type="button" class="registration-no-color-foot-button" title="拒绝发药" onclick="cancelSubmit(\'' + row.pageNo + '\',\'' + row.wardName + '\',\'' + row.pageClass + '\')"><i class="fa fa-reply"></i></button>';
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |              return str;
 | 
	
		
			
				|  |  |          }
 | 
	
	
		
			
				|  | @@ -514,7 +514,7 @@ function initColumns() {
 | 
	
		
			
				|  |  |          align: "center",
 | 
	
		
			
				|  |  |          valign: 'middle'
 | 
	
		
			
				|  |  |      }];
 | 
	
		
			
				|  |  | -    if (groupNo === '81') {
 | 
	
		
			
				|  |  | +    if (groupNo === '81' || groupNo === '83') {
 | 
	
		
			
				|  |  |          return base.concat(zy)
 | 
	
		
			
				|  |  |      } else {
 | 
	
		
			
				|  |  |          return base.concat(xy)
 | 
	
	
		
			
				|  | @@ -533,7 +533,7 @@ function loadSummarizingTable() {
 | 
	
		
			
				|  |  |          pageClass: pageClass,
 | 
	
		
			
				|  |  |          submitFlag: $("#submitFlagSearch").val()
 | 
	
		
			
				|  |  |      };
 | 
	
		
			
				|  |  | -    if (groupNo === '81') {
 | 
	
		
			
				|  |  | +    if (groupNo === '81' || groupNo === '83') {
 | 
	
		
			
				|  |  |          url = '/thmz/getZyDrugCyCount';
 | 
	
		
			
				|  |  |          tem = {};
 | 
	
		
			
				|  |  |      }
 | 
	
	
		
			
				|  | @@ -619,7 +619,7 @@ function initSummarizingTable() {
 | 
	
		
			
				|  |  |          rownumWidth: 50,
 | 
	
		
			
				|  |  |          rowNum: -1,//取消分页
 | 
	
		
			
				|  |  |          caption: '请领单药品汇总',
 | 
	
		
			
				|  |  | -        grouping: groupNo === '81' ? false : true,
 | 
	
		
			
				|  |  | +        grouping: (!(groupNo === '81' || groupNo === '83')),
 | 
	
		
			
				|  |  |          groupingView: {
 | 
	
		
			
				|  |  |              groupField: ['pageClass'],
 | 
	
		
			
				|  |  |              groupSummary: [false],//是否开启汇总页脚
 | 
	
	
		
			
				|  | @@ -648,7 +648,7 @@ function initSummarizingTable() {
 | 
	
		
			
				|  |  |                  width: 30,
 | 
	
		
			
				|  |  |                  editable: true,
 | 
	
		
			
				|  |  |                  formatter: "select",
 | 
	
		
			
				|  |  | -                hidden: (pageClass === 'T' || groupNo === '81' || pageClass === 'HT') ? true : false,
 | 
	
		
			
				|  |  | +                hidden: (pageClass === 'T' || groupNo === '81' || groupNo === '83' || pageClass === 'HT'),
 | 
	
		
			
				|  |  |                  edittype: "select",
 | 
	
		
			
				|  |  |                  editoptions: (pageClass === '3' || pageClass === '4') ? {value: "0:发药;1:暂缓"} : {value: "0:发药;1:暂缓;2:拒发"},
 | 
	
		
			
				|  |  |                  formatter: function (cellvalue, options, rowObject) {
 | 
	
	
		
			
				|  | @@ -687,11 +687,11 @@ function initSummarizingTable() {
 | 
	
		
			
				|  |  |                  index: 'inpatientNo',
 | 
	
		
			
				|  |  |                  align: 'center',
 | 
	
		
			
				|  |  |                  width: 30,
 | 
	
		
			
				|  |  | -                hidden: groupNo === '81' ? false : true
 | 
	
		
			
				|  |  | +                hidden: (!(groupNo === '81' || groupNo === '83'))
 | 
	
		
			
				|  |  |              },
 | 
	
		
			
				|  |  | -            {name: 'bedNo', index: 'bedNo', align: 'center', width: 30, hidden: groupNo === '81' ? false : true},
 | 
	
		
			
				|  |  | -            {name: 'name', index: 'name', align: 'center', width: 30, hidden: groupNo === '81' ? false : true},
 | 
	
		
			
				|  |  | -            {name: 'quantityDj', index: 'quantityDj',width: 30, hidden: groupNo === '81' ? false : true,
 | 
	
		
			
				|  |  | +            {name: 'bedNo', index: 'bedNo', align: 'center', width: 30, hidden: (!(groupNo === '81' || groupNo === '83'))},
 | 
	
		
			
				|  |  | +            {name: 'name', index: 'name', align: 'center', width: 30, hidden: (!(groupNo === '81' || groupNo === '83'))},
 | 
	
		
			
				|  |  | +            {name: 'quantityDj', index: 'quantityDj',width: 30, hidden: (!(groupNo === '81' || groupNo === '83')),
 | 
	
		
			
				|  |  |                  formatter: function (cellvalue, options, rowObject) {
 | 
	
		
			
				|  |  |                      return cellvalue==0?'':cellvalue
 | 
	
		
			
				|  |  |                  }},
 | 
	
	
		
			
				|  | @@ -715,14 +715,14 @@ function initSummarizingTable() {
 | 
	
		
			
				|  |  |                  index: 'minAmount',
 | 
	
		
			
				|  |  |                  align: 'center',
 | 
	
		
			
				|  |  |                  width: 30,
 | 
	
		
			
				|  |  | -                hidden: groupNo === '81' ? false : true
 | 
	
		
			
				|  |  | +                hidden: (!(groupNo === '81' || groupNo === '83'))
 | 
	
		
			
				|  |  |              },
 | 
	
		
			
				|  |  |              {
 | 
	
		
			
				|  |  |                  name: 'amountCount',
 | 
	
		
			
				|  |  |                  index: 'amountCount',
 | 
	
		
			
				|  |  |                  align: 'center',
 | 
	
		
			
				|  |  |                  width: 30,
 | 
	
		
			
				|  |  | -                hidden: groupNo === '81' ? false : true,
 | 
	
		
			
				|  |  | +                hidden: (!(groupNo === '81' || groupNo === '83')),
 | 
	
		
			
				|  |  |                  formatter: function (cellvalue, options, rowObject) {
 | 
	
		
			
				|  |  |                      return rowObject.amount * rowObject.minAmount
 | 
	
		
			
				|  |  |                  }
 | 
	
	
		
			
				|  | @@ -750,7 +750,7 @@ function initSummarizingTable() {
 | 
	
		
			
				|  |  |                      let money = 0;
 | 
	
		
			
				|  |  |                      if(rowObject.retprice === '合计'){
 | 
	
		
			
				|  |  |                          money = cellvalue;
 | 
	
		
			
				|  |  | -                    } else if (groupNo === '81') {
 | 
	
		
			
				|  |  | +                    } else if (groupNo === '81' || groupNo === '83') {
 | 
	
		
			
				|  |  |                          money = keepTwoDecimal(rowObject.retprice * rowObject.amount * rowObject.minAmount);
 | 
	
		
			
				|  |  |                      } else {
 | 
	
		
			
				|  |  |                          money = keepTwoDecimal(rowObject.retprice * rowObject.amount);
 | 
	
	
		
			
				|  | @@ -763,14 +763,14 @@ function initSummarizingTable() {
 | 
	
		
			
				|  |  |                  index: 'manufactory',
 | 
	
		
			
				|  |  |                  align: 'left',
 | 
	
		
			
				|  |  |                  width: 60,
 | 
	
		
			
				|  |  | -                hidden: groupNo === '81' ? true : false
 | 
	
		
			
				|  |  | +                hidden: (!(groupNo === '81' || groupNo === '83'))
 | 
	
		
			
				|  |  |              },
 | 
	
		
			
				|  |  |              {
 | 
	
		
			
				|  |  |                  name: 'pageClass',
 | 
	
		
			
				|  |  |                  index: 'pageClass',
 | 
	
		
			
				|  |  |                  align: 'center',
 | 
	
		
			
				|  |  |                  width: 40,
 | 
	
		
			
				|  |  | -                hidden: groupNo === '81' ? true : false
 | 
	
		
			
				|  |  | +                hidden: (!(groupNo === '81' || groupNo === '83'))
 | 
	
		
			
				|  |  |              },
 | 
	
		
			
				|  |  |              {   name: 'confirmTime',
 | 
	
		
			
				|  |  |                  index: 'confirmTime',
 | 
	
	
		
			
				|  | @@ -782,7 +782,7 @@ function initSummarizingTable() {
 | 
	
		
			
				|  |  |                      }
 | 
	
		
			
				|  |  |                      return "";
 | 
	
		
			
				|  |  |                  },
 | 
	
		
			
				|  |  | -                hidden: groupNo === '81' ? true : false
 | 
	
		
			
				|  |  | +                hidden: (!(groupNo === '81' || groupNo === '83'))
 | 
	
		
			
				|  |  |              },
 | 
	
		
			
				|  |  |              {name: 'serial', index: 'serial', align: 'center', width: 40, hidden: true},
 | 
	
		
			
				|  |  |              {
 | 
	
	
		
			
				|  | @@ -834,7 +834,7 @@ function initSummarizingTable() {
 | 
	
		
			
				|  |  |      });
 | 
	
		
			
				|  |  |      $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='打印汇总药单' onclick='printCount(0)' style='margin-left: 10px;'><i class='fa fa-print'></i></button>");
 | 
	
		
			
				|  |  |      $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='打印口服标签' onclick='printLabelData(0)' style='color: green;margin-left: 10px;'><i class='fa fa-print'></i></button>");
 | 
	
		
			
				|  |  | -    if (($("#submitFlagSearch").val() === '1' && groupNo !== '81') || ($("#submitFlagSearch").val() === '3' && groupNo === '81')) {
 | 
	
		
			
				|  |  | +    if (($("#submitFlagSearch").val() === '1' && groupNo !== '81' && groupNo !== '83') || ($("#submitFlagSearch").val() === '3' && (groupNo === '81' || groupNo === '83'))) {
 | 
	
		
			
				|  |  |          $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='保存药单' id='collect_save' onclick='save(0)' style='color: green;margin-left: 10px;'><i class='fa fa-floppy-o'></i></button>");
 | 
	
		
			
				|  |  |      } else {
 | 
	
		
			
				|  |  |          $("#t_tb_summarizing_table").append("<button class='registration-no-color-foot-button' title='保存批号' id='manu_save_hz' style='color: green;margin-left: 10px;'><i class='fa fa-floppy-o'></i></button>");
 | 
	
	
		
			
				|  | @@ -1147,7 +1147,7 @@ function queryParams(params) {
 | 
	
		
			
				|  |  |          groupNo: groupNo,
 | 
	
		
			
				|  |  |          submitFlag: $("#submitFlagSearch").val()
 | 
	
		
			
				|  |  |      };
 | 
	
		
			
				|  |  | -    if (groupNo !== '81') {
 | 
	
		
			
				|  |  | +    if (groupNo !== '81' && groupNo !== '83') {
 | 
	
		
			
				|  |  |          temp.pageClass = $("#pageClassSearch").val() == "" ? null : $("#pageClassSearch").val();
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |      return temp;
 | 
	
	
		
			
				|  | @@ -1161,7 +1161,7 @@ function cleanParams() {
 | 
	
		
			
				|  |  |      $("#pageNoSearch").val(null);
 | 
	
		
			
				|  |  |      $("#pageClassSearch").val(null);
 | 
	
		
			
				|  |  |      $("#wardCode").selectpicker('val', '');
 | 
	
		
			
				|  |  | -    if (groupNo === '81') {
 | 
	
		
			
				|  |  | +    if (groupNo === '81' || groupNo === '83') {
 | 
	
		
			
				|  |  |          $("#submitFlagSearch").val(3);
 | 
	
		
			
				|  |  |      } else {
 | 
	
		
			
				|  |  |          $("#submitFlagSearch").val(1);
 | 
	
	
		
			
				|  | @@ -1269,10 +1269,19 @@ function printCyCount(flag) {
 | 
	
		
			
				|  |  |          i += 2;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |      $("#trContent").append(html);
 | 
	
		
			
				|  |  | -    let totalContent = '共 ' + datas[0].amount + ' 剂,' + datas[0].orderJe + ' 元/剂,院内代煎 ' + datas[0].quantityDj + ' 剂,' +
 | 
	
		
			
				|  |  | -        '药费总金额:' + keepTwoDecimal(datas[0].orderJe * datas[0].amount) + ',代煎费:' + datas[0].quantityDj * datas[0].orderJeDj + '。';
 | 
	
		
			
				|  |  | -    let fyfsContent = '每天 ' + datas[0].cyMtjs + ' 剂,' + datas[0].cyJssm + datas[0].cyJsl + 'ml,煮取' + datas[0].cyZql + 'ml,复煎 ' + datas[0].cyFj + ' 次,' +
 | 
	
		
			
				|  |  | -        '分 ' + datas[0].cyFfcs + ' 次,' + datas[0].fysmContent + '。';
 | 
	
		
			
				|  |  | +    let totalContent;
 | 
	
		
			
				|  |  | +    let fyfsContent;
 | 
	
		
			
				|  |  | +    if(groupNo === '83'){
 | 
	
		
			
				|  |  | +        totalContent = '共 ' + datas[0].amount + ' 剂,' + datas[0].orderJe + ' 元/剂,' +
 | 
	
		
			
				|  |  | +            '药费总金额:' + keepTwoDecimal(datas[0].orderJe * datas[0].amount) + '元。';
 | 
	
		
			
				|  |  | +        fyfsContent = '每天 ' + datas[0].cyMtjs + ' 剂,' + datas[0].cyJssm + datas[0].cyJsl + 'ml,' +
 | 
	
		
			
				|  |  | +            '分 ' + datas[0].cyFfcs + ' 次,' + datas[0].fysmContent + '。';
 | 
	
		
			
				|  |  | +    } else {
 | 
	
		
			
				|  |  | +        totalContent = '共 ' + datas[0].amount + ' 剂,' + datas[0].orderJe + ' 元/剂,院内代煎 ' + datas[0].quantityDj + ' 剂,' +
 | 
	
		
			
				|  |  | +            '药费总金额:' + keepTwoDecimal(datas[0].orderJe * datas[0].amount) + '元,代煎费:' + datas[0].quantityDj * datas[0].orderJeDj + '元。';
 | 
	
		
			
				|  |  | +        fyfsContent = '每天 ' + datas[0].cyMtjs + ' 剂,' + datas[0].cyJssm + datas[0].cyJsl + 'ml,煮取' + datas[0].cyZql + 'ml,复煎 ' + datas[0].cyFj + ' 次,' +
 | 
	
		
			
				|  |  | +            '分 ' + datas[0].cyFfcs + ' 次,' + datas[0].fysmContent + '。';
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  |      $(".total").text(totalContent);
 | 
	
		
			
				|  |  |      $(".fyfs").text(fyfsContent);
 | 
	
		
			
				|  |  |      $(".doctorName").text(datas[0].doctorName);
 | 
	
	
		
			
				|  | @@ -1284,7 +1293,7 @@ function printCyCount(flag) {
 | 
	
		
			
				|  |  |   * @param flag 0:手动打印 1:保存后自动打印
 | 
	
		
			
				|  |  |   */
 | 
	
		
			
				|  |  |  function printCount(flag) {
 | 
	
		
			
				|  |  | -    if (groupNo === '81') {
 | 
	
		
			
				|  |  | +    if (groupNo === '81' || groupNo === '83') {
 | 
	
		
			
				|  |  |          printCyCount(flag);
 | 
	
		
			
				|  |  |      } else {
 | 
	
		
			
				|  |  |          printXyCount(flag);
 | 
	
	
		
			
				|  | @@ -1519,7 +1528,7 @@ function printDetailHtml(dataArr, flag) {
 | 
	
		
			
				|  |  |   * @param isByj 是否使用摆药机
 | 
	
		
			
				|  |  |   */
 | 
	
		
			
				|  |  |  function printLabelData(flag, isByj) {
 | 
	
		
			
				|  |  | -    if (groupNo === '81') {
 | 
	
		
			
				|  |  | +    if (groupNo === '81' || groupNo === '83') {
 | 
	
		
			
				|  |  |          printZyLabelData();
 | 
	
		
			
				|  |  |      } else {
 | 
	
		
			
				|  |  |          printXyLabelData(flag, isByj);
 | 
	
	
		
			
				|  | @@ -1578,7 +1587,16 @@ function printZyLabelData() {
 | 
	
		
			
				|  |  |      $('#zydyNameLabel').val(data.name);
 | 
	
		
			
				|  |  |      $('#bedNoLabel').val(data.bedNo);
 | 
	
		
			
				|  |  |      $('#wardLabel').val(w_code.substring(0, w_code.lastIndexOf("(")));
 | 
	
		
			
				|  |  | -    $('#dyslLabel').val(data.amount * 2);
 | 
	
		
			
				|  |  | +    $('#dyslLabel').val(groupNo === '83' ? data.amount : data.amount * 2);
 | 
	
		
			
				|  |  | +    let fyfsContent;
 | 
	
		
			
				|  |  | +    if(groupNo === '83'){
 | 
	
		
			
				|  |  | +        fyfsContent = '每天' + data.cyMtjs + '剂,' + data.cyJssm + data.cyJsl + 'ml,' +
 | 
	
		
			
				|  |  | +            '分' + data.cyFfcs + '次,' + data.fysmContent;
 | 
	
		
			
				|  |  | +    } else {
 | 
	
		
			
				|  |  | +        fyfsContent = '每天' + data.cyMtjs + '剂,' + data.cyJssm + data.cyJsl + 'ml,煮取' + data.cyZql + 'ml,复煎' + data.cyFj
 | 
	
		
			
				|  |  | +            + '次,' + '分' + data.cyFfcs + '次,' + data.fysmContent;
 | 
	
		
			
				|  |  | +    }
 | 
	
		
			
				|  |  | +    $('#yfLabel').val(fyfsContent);
 | 
	
		
			
				|  |  |      $('#dateLabel').val(format(new Date(), "MM-dd"));
 | 
	
		
			
				|  |  |      $('#zydybqModal').modal();
 | 
	
		
			
				|  |  |  }
 | 
	
	
		
			
				|  | @@ -1766,7 +1784,7 @@ function save(flag) {
 | 
	
		
			
				|  |  |      if (!confirm("确定要对当前药单进行发药处理吗?")) {
 | 
	
		
			
				|  |  |          return;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | -    if (groupNo === '81') {
 | 
	
		
			
				|  |  | +    if (groupNo === '81' || groupNo === '83') {
 | 
	
		
			
				|  |  |          sendZy();
 | 
	
		
			
				|  |  |      } else {
 | 
	
		
			
				|  |  |          $("#" + (flag == 0 ? "tb_summarizing_table" : "tb_detail_table")).jqGrid("saveCell", lastrow, lastcell);//当前单元格退出编辑模式
 | 
	
	
		
			
				|  | @@ -1829,7 +1847,7 @@ function sendXy(flag) {
 | 
	
		
			
				|  |  |                  } else {
 | 
	
		
			
				|  |  |                      getPrintDetail(1);
 | 
	
		
			
				|  |  |                  }
 | 
	
		
			
				|  |  | -                groupNo === '81'?$("#submitFlagSearch").val("4"):$("#submitFlagSearch").val("3");
 | 
	
		
			
				|  |  | +                (groupNo === '81' || groupNo === '83') ? $("#submitFlagSearch").val("4"):$("#submitFlagSearch").val("3");
 | 
	
		
			
				|  |  |                  $("#submitFlagSearch").selectpicker('refresh');
 | 
	
		
			
				|  |  |                  if ('5' === pageClass || ('6' === pageClass && confirm("是否需要打印当前药单的口服标签并使用摆药机?"))) {
 | 
	
		
			
				|  |  |                      if (res.data) {
 | 
	
	
		
			
				|  | @@ -1861,7 +1879,7 @@ function cancelSubmit(pageNo, wardName, pageClass) {
 | 
	
		
			
				|  |  |      if (!confirm("确定要撤销【" + wardName + "】提交的(" + pageNo + ")药单吗?")) {
 | 
	
		
			
				|  |  |          return;
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | -    if (groupNo === '81') {
 | 
	
		
			
				|  |  | +    if (groupNo === '81' || groupNo === '83') {
 | 
	
		
			
				|  |  |          cancelZySubmit(pageNo)
 | 
	
		
			
				|  |  |      } else {
 | 
	
		
			
				|  |  |          cancelXySubmit(pageNo, pageClass)
 |