增加医技执行科室与诊疗次数

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

@@ -1520,7 +1520,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     mzYjReq.setOrderName(jcZdItem.getName());
                     mzYjReq.setGroupName(jcZdItem.getName());
                     mzYjReq.setReqType(ReqTypeEnum.JIAN_CHA.code);
-                    mzYjReq.setExecDept(jcZdItem.getExecUnit());
+                    if(StringUtils.isBlank(mzYjReq.getExecDept())){
+                        mzYjReq.setExecDept(jcZdItem.getExecUnit());
+                    }
                     mzYjReq.setReqComment(mzPrescriptionVo.getMzBlRecord().getEmrChiefComplaint());
                     mzYjReq.setReqTzComment(reqTzComment);
                 } else {
@@ -1531,7 +1533,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     mzYjReq.setOrderName(jyZdItem.getName());
                     mzYjReq.setGroupName(jyZdItem.getName());
                     mzYjReq.setReqType(ReqTypeEnum.JIAN_YAN.code);
-                    mzYjReq.setExecDept(jyZdItem.getExecUnit());
+                    if(StringUtils.isBlank(mzYjReq.getExecDept())){
+                        mzYjReq.setExecDept(jyZdItem.getExecUnit());
+                    }
                 }
                 if (setEmrProcess) {
                     zlIndex++;
@@ -1711,7 +1715,9 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     mzChargeDetail.setBillItemCode(zdChargeItem.getBillItemMz());
                     mzChargeDetail.setTcName(zdChargeItem.getName());
                     mzChargeDetail.setGroupNo(Constants.YJ_GROUP_NO);
-                    mzChargeDetail.setExecDept(mzChargeDetail.getExecDept());
+                    if(StringUtils.isBlank(mzChargeDetail.getExecDept())){
+                        mzChargeDetail.setExecDept(mzChargeDetail.getExecDept());
+                    }
                     mzChargeDetail.setDrugWin(1);
                     mzChargeDetail.setGroupType(GroupTypeEnum.DIAGNOSIS.code);
                     mzChargeDetail.setSupplyAmount(1);

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

@@ -194,7 +194,7 @@ $(function () {
     //initNavTabs(3);
     //初始医生工作太配置
     initWorkspaceConfigForCurrent();
-
+    initExecUnit();
     /**
      * 西药点击事件
      */
@@ -1308,6 +1308,11 @@ function callBackZlDetail(code, mzChargeDetail) {
                     $("#current_code").val(row.code);
                     $("#remark").val(mzChargeDetail.instructionText);
                     $("#jcJyZltype").val(row.type);
+                    if(mzChargeDetail.execDept!=null && mzChargeDetail.execDept!=""){
+                        $("#execUnit").selectpicker('val', mzChargeDetail.execDept);
+                        $('#execUnit').selectpicker('refresh');
+                    }
+                    $("#itemQuantity").val(mzChargeDetail.quantity);
                     saveJyJcItem(false);
                 }
             } else {
@@ -1435,11 +1440,19 @@ function editPrescription(jsonData, type) {
                 var code = mzYjReq.orderCode;
                 if (mzYjReq.reqType == 2) {
                     $("#jcJyZltype").val(1);
+                    $("#jyZdSample").selectpicker('val', mzYjReq.inspectStuff);
+                    $('#jyZdSample').selectpicker('refresh');
                 } else if (mzYjReq.reqType == 3) {
                     $("#jcJyZltype").val(2);
+                    $("#yshPart").selectpicker('val', mzYjReq.inspectPart);
+                    $('#yshPart').selectpicker('refresh');
                 }
                 checkJcJyItemInfo(code, null, false);
                 $("#remark").val(mzYjReq.jyRemark);
+                if(mzYjReq.execDept!=null && mzYjReq.execDept!=""){
+                    $("#execUnit").selectpicker('val', mzYjReq.execDept);
+                    $('#execUnit').selectpicker('refresh');
+                }
                 $("#jcJyItemChargeDetail").removeClass("hide").addClass("in");
                 saveJyJcItem(false);
                 $("#jcJyItemChargeDetail").removeClass("in").addClass("hide");
@@ -2069,18 +2082,21 @@ function saveWesternMedicine(calculateTotalAmountFlag) {
     var supplyType = $("#supplyType").val();
     //用法描述
     var supplyTypeText = $('#supplyType option:selected').text();
+    supplyTypeText=supplyTypeText.substring(0,supplyTypeText.indexOf("("));
     //药品默认单次使用剂量
     var drugWinDb = $("#drugWinDb").val();
     //处方实际单次使用剂量
     var drugWin = $("#drugWin").val();
     //剂量单位
     var drugWinUnit = $('#drugWinUnit option:selected').text();
+    drugWinUnit=drugWinUnit.substring(0,drugWinUnit.indexOf("("));
     //天数
     var dayNum = $("#dayNum").val();
     //频次编码
     var orderFrequency = $("#orderFrequency").val();
     //频次描述
     var orderFrequencyText = $('#orderFrequency option:selected').text();
+    orderFrequencyText=orderFrequencyText.substring(0,orderFrequencyText.indexOf("("));
     //总量
     var gross = $("#gross").val();
     //包装单位
@@ -2092,6 +2108,7 @@ function saveWesternMedicine(calculateTotalAmountFlag) {
     var medicalAdvice = $("#medicalAdvice").val();
     //医嘱内容
     var medicalAdviceText = $('#medicalAdvice option:selected').text();
+    medicalAdviceText=medicalAdviceText.substring(0,medicalAdviceText.indexOf("("));
     //金额
     var totalRetprice = parseFloat($("#totalRetprice").val());
     //单价
@@ -2434,6 +2451,12 @@ function editJyJcItem(obj) {
 
     var chargeUnit = $(parentObject).find("input.temporary_items_desc_value").val();
     var jcJyZltype = $(parentObject).find("input.temporary_items_type").val();
+    //数量
+    var itemQuantity = $(parentObject).find("input.temporary_items_itemQuantity").val();
+    //执行科室
+    var execUnit = $(parentObject).find("input.temporary_items_execUnit").val();
+    $("#execUnit").selectpicker('val', execUnit);
+    $('#execUnit').selectpicker('refresh');
     if (jcJyZltype == 1 || jcJyZltype == "1") {
         $("#jyZdSample").selectpicker('val', chargeUnit);
         $('#jyZdSample').selectpicker('refresh');
@@ -2441,6 +2464,7 @@ function editJyJcItem(obj) {
         $("#chargeUnitDiv").removeClass("in").addClass("hide");
         $("#yshPartDiv").removeClass("in").addClass("hide");
         $("#jcJyItemChargeDetail").removeClass("hide").addClass("in");
+        $("#itemQuantityDiv").removeClass("in").addClass("hide");
     } else if (jcJyZltype == 2 || jcJyZltype == "2") {
         $("#yshPart").selectpicker('val', chargeUnit);
         $('#yshPart').selectpicker('refresh');
@@ -2448,13 +2472,16 @@ function editJyJcItem(obj) {
         $("#jyZdSampleDiv").removeClass("in").addClass("hide");
         $("#chargeUnitDiv").removeClass("in").addClass("hide");
         $("#jcJyItemChargeDetail").removeClass("hide").addClass("in");
+        $("#itemQuantityDiv").removeClass("in").addClass("hide");
     } else if (jcJyZltype == 3 || jcJyZltype == "3") {
         //描述
         $("#chargeUnit").val(chargeUnit);
+        $("#itemQuantity").val(itemQuantity);
         $("#chargeUnitDiv").removeClass("hide").addClass("in");
         $("#jyZdSampleDiv").removeClass("in").addClass("hide");
         $("#yshPartDiv").removeClass("in").addClass("hide");
         $("#jcJyItemChargeDetail").removeClass("in").addClass("hide");
+        $("#itemQuantityDiv").removeClass("hide").addClass("in");
     }
     $("#jcJyZltype").val(jcJyZltype);
 }
@@ -2519,9 +2546,16 @@ function saveJyJcItemReal(calculateTotalAmountFlag) {
     var jcjyItemPrice = $("#jcjyItemPrice").val();
     //描述
     var chargeUnit = $("#chargeUnit").val();
+    //执行科室
+    var execUnit = $("#execUnit").val();
+    //执行科室
+    var execUnitName = $('#execUnit option:selected').text();
+    execUnitName=execUnitName.substring(0,execUnitName.indexOf("("));
+    //次数
+    var itemQuantity = $("#itemQuantity").val();
     //描述编码
     var chargeUnitCode = chargeUnit;
-    var chargeUnitName = "描述:";
+    var chargeUnitName = " 描述:";
     //备注
     var remark = $("#remark").val();
     //项目类型
@@ -2529,13 +2563,15 @@ function saveJyJcItemReal(calculateTotalAmountFlag) {
     if (jcJyZltype == "1" || jcJyZltype == 1) {
         //检验
         chargeUnit = $('#jyZdSample option:selected').text();
+        chargeUnit=chargeUnit.substring(0,chargeUnit.indexOf("("));
         chargeUnitCode = $('#jyZdSample').val();
-        chargeUnitName = "检验物:";
+        chargeUnitName = " 检验物:";
     } else if (jcJyZltype == "2" || jcJyZltype == 2) {
         //检查
         chargeUnit = $('#yshPart option:selected').text();
+        chargeUnit=chargeUnit.substring(0,chargeUnit.indexOf("("));
         chargeUnitCode = $('#yshPart').val();
-        chargeUnitName = "检查部位:";
+        chargeUnitName = " 检查部位:";
     }
     if (currentCode == null || currentCode == '') {
         if (calculateTotalAmountFlag == true) {
@@ -2582,6 +2618,12 @@ function saveJyJcItemReal(calculateTotalAmountFlag) {
     var html = '<div class="form-group">';
     html += '<span class="jcjyItemGroupId">' + groupId + '</span>.<span style="margin-left: 5px"></span>'
     html += jcJyItem + ' ';
+    if (jcJyZltype == "3" || jcJyZltype == 3) {
+        html+=" 数量:"+itemQuantity;
+    }
+    if(execUnit!=null && execUnit!=""){
+        html+=" 执行科室:"+execUnitName;
+    }
     if (chargeUnit != null && chargeUnit != '') {
         html += chargeUnitName + chargeUnit;
     }
@@ -2601,6 +2643,8 @@ function saveJyJcItemReal(calculateTotalAmountFlag) {
     html += '<input type="hidden" class="temporary_items_remark" value="' + remark + '"/>';
     html += '<input type="hidden" class="temporary_items_type" value="' + jcJyZltype + '"/>';
     html += '<input type="hidden" class="temporary_items_desc_value" value="' + chargeUnitCode + '"/>';
+    html += '<input type="hidden" class="temporary_items_itemQuantity" value="' + itemQuantity + '"/>';
+    html += '<input type="hidden" class="temporary_items_execUnit" value="' + execUnit + '"/>';
     html += '</div>';
     //当没有下一个兄弟节点或者当前编辑的药品是最后一个时，直接添加
     if (nextObj == null || isLast) {
@@ -2935,14 +2979,18 @@ function clearJyJcItem() {
     //描述
     $("#chargeUnit").val(null);
     $("#jcJyZltype").val(null);
+    $("#itemQuantity").val(1);
     $("#jyZdSample").selectpicker('val', null);
     $('#jyZdSample').selectpicker('refresh');
     $("#yshPart").selectpicker('val', null);
     $('#yshPart').selectpicker('refresh');
+    $("#execUnit").selectpicker('val', null);
+    $('#execUnit').selectpicker('refresh');
     $("#jcJyItemChargeDetail").removeClass("in").addClass("hide");
     $("#chargeUnitDiv").removeClass("in").addClass("hide");
     $("#jyZdSampleDiv").removeClass("in").addClass("hide");
     $("#yshPartDiv").removeClass("in").addClass("hide");
+    $("#itemQuantityDiv").removeClass("in").addClass("hide");
 }
 
 /**
@@ -4255,6 +4303,8 @@ function loadjcJyItemList() {
         onClickRow: function (row, $element) {
             $('#jcJyItem').webuiPopover('hide');
             $("#jcJyZltype").val(row.type);
+            $("#execUnit").selectpicker('val', row.execUnit);//默认不选中
+            $("#execUnit").selectpicker('refresh');
             if (row.type == 3) {
                 //诊疗
                 if ($("#zlTab").find("li") == null || $("#zlTab").find("li").length == 0) {
@@ -4269,6 +4319,7 @@ function loadjcJyItemList() {
                 $("#chargeUnitDiv").removeClass("hide").addClass("in");
                 $("#jyZdSampleDiv").removeClass("in").addClass("hide");
                 $("#yshPartDiv").removeClass("in").addClass("hide");
+                $("#itemQuantityDiv").removeClass("hide").addClass("in");
                 return;
             }
             if (row.type == 1) {
@@ -4290,6 +4341,7 @@ function loadjcJyItemList() {
                     $('#yshPart').selectpicker('refresh');
                 }
             }
+            $("#itemQuantityDiv").removeClass("in").addClass("hide");
             $("#jcJyItemChargeDetail").removeClass("hide").addClass("in");
             checkJcJyItemInfo(row.code, row.name, true);
         }
@@ -4336,6 +4388,8 @@ function checkJcJyItemInfo(code, name, async) {
                     $("#jcJyItem").blur();
                     $("#jcjyItemPrice").val(res.totalAmount);
                     $("#current_code").val(code);
+                    $("#execUnit").selectpicker('val', res.execUnit);//默认不选中
+                    $("#execUnit").selectpicker('refresh');
                 }
             } else {
                 errorMesage(res);
@@ -5432,15 +5486,19 @@ function getParamsForpPrescription() {
             var tempJson = null;
             //项目类型
             var itemsType = $(zlTabContents[i]).find("input.temporary_items_type").val();
+            //执行科室
+            var execUnit = $(zlTabContents[i]).find("input.temporary_items_execUnit").val();
             if (itemsType == "3" || itemsType == 3) {
                 //诊疗，放入药品类型中入库，因为诊疗是与药品一样直接入明细库，但是是与医技在同一处方开立页面开立
-                tempJson = JSON.parse('{"chargeItemCode": "","serial": "","quantity": "1","drugQuan": "1","drugUnit": "","frequency": "","orderDays": "1","paySelf": "0","drugWin": "1","instructionCode":"","instructionText":"","orderNo":"","groupOrder":"","supplyCode":"","cyJssm":"","cyDj":"","cyFysm":"","tryFlag":"0","groupNo":"00"}');
+                tempJson = JSON.parse('{"chargeItemCode": "","serial": "","quantity": "1","drugQuan": "1","drugUnit": "","frequency": "","orderDays": "1","paySelf": "0","drugWin": "1","instructionCode":"","instructionText":"","orderNo":"","groupOrder":"","supplyCode":"","cyJssm":"","cyDj":"","cyFysm":"","tryFlag":"0","groupNo":"00","execDept":""}');
                 tempJson.chargeItemCode = $(zlTabContents[i]).find("input.temporary_items_code").val();
                 tempJson.instructionText = $(zlTabContents[i]).find("input.temporary_items_remark").val();
+                tempJson.quantity = $(zlTabContents[i]).find("input.temporary_items_itemQuantity").val();
                 tempJson.orderNo = orderNo;
+                tempJson.execDept = execUnit;
                 jsonData.mzChargeDetailList[jsonData.mzChargeDetailList.length] = tempJson;
             } else {
-                tempJson = JSON.parse('{"orderCode":"","inspectPart":"","inspectStuff":"","jyRemark":"","orderNo":"1"}');
+                tempJson = JSON.parse('{"orderCode":"","inspectPart":"","inspectStuff":"","jyRemark":"","orderNo":"1","execDept":""}');
                 tempJson.orderCode = $(zlTabContents[i]).find("input.temporary_items_code").val();
                 if (itemsType == "1" || itemsType == 1) {
                     //检验
@@ -5451,6 +5509,7 @@ function getParamsForpPrescription() {
                 }
                 tempJson.jyRemark = $(zlTabContents[i]).find("input.temporary_items_remark").val();
                 tempJson.orderNo = orderNo;
+                tempJson.execDept = execUnit;
                 jsonData.mzYjReqList[jsonData.mzYjReqList.length] = tempJson;
             }
         }
@@ -5571,7 +5630,8 @@ function saveapidAccepts() {
                 }
                 if (res.code == 0) {
                     successMesage(res);
-                    clearWorkSpace();
+                    //范本保存完不清空
+                    //clearWorkSpace();
                 } else {
                     $("#saveapidAcceptsModal").modal();
                     errorMesage(res);
@@ -6896,4 +6956,32 @@ function printZyReq(patientId) {
             }
         }
     });
+}
+
+
+
+/**
+ * 初始化科室下拉选
+ */
+function initExecUnit() {
+    //父科室列表
+    $.ajax({
+        type: "GET",
+        url: '/thmz/allUnitCode',
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (data) {
+            if (data == '401' || data == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            $('#execUnit').empty();   //清空resText里面的所有内容
+            var html = '';
+            $.each(data.data, function (commentIndex, comment) {
+                html += '<option value="' + comment.code + '">' + comment.name + '(' + comment.pyCode + '-' + comment.code + ')</option>';
+            });
+            $('#execUnit').html(html);
+            $('#execUnit').selectpicker('refresh');
+        }
+    });
 }

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

@@ -738,6 +738,22 @@
                                     </div>
                                     <input type="hidden" id="jcJyZltype"/>
                                 </div>
+                                <div class="item form-group">
+                                    <div style="width: 256px;float: left;">
+                                        <label class="my_label_2" style="width: 70px;">执行科室：</label>
+                                        <div style="width: 163px;float: left;">
+                                            <select class="form-control selectpicker show-tick"  data-live-search="true"
+                                                    id="execUnit">
+                                            </select>
+                                        </div>
+                                    </div>
+
+                                    <div style="width: 130px;float: left;" class="hide"  id="itemQuantityDiv">
+                                        <label class="my_label" style="width: 40px;">数量：</label>
+                                        <input type="number" class="form-control my_label_input_2" id="itemQuantity"
+                                               style="padding-left: 10px;" value="1">
+                                    </div>
+                                </div>
                                 <div class="item form-group">
                                     <div style="width: 100%">
                                         <label class="my_label_2">备注：</label>