门诊诊疗支持频率

增加门诊黄码免费采样项目

src/main/java/cn/hnthyy/thmz/common/Constants.java

@@ -144,7 +144,6 @@ public class Constants {
      */
     public static final String CASH = "1";
 
-
     /**
      * 本院记账付款方式
      */
@@ -205,6 +204,11 @@ public class Constants {
      */
     public static final String YJ_GROUP_NO = "00";
 
+    /**
+     * 黄码申请核酸说明（因为非特殊情况禁止0元收费方式收费）
+     */
+    public static final String NUCLEIC_ONLY_YELLOW_ACID_APPLICATION = "nucleicOnlyYellowAcidApplication";
+
     /**
      * 静脉采血编码
      */
@@ -382,6 +386,10 @@ public class Constants {
      * 自助部编码
      */
     public static final String ZZBM = "1400004";
+    /**
+     * 核酸检测（单人单管仅限黄码）项目编码
+     */
+    public static final String NUCLEIC_ORDER_ONLY_YELLOW_CODE = "004736";
     /**
      * 核酸检测（单人单管）项目编码
      */

src/main/java/cn/hnthyy/thmz/controller/api/MedicalViewApiController.java

@@ -1142,6 +1142,60 @@ public class MedicalViewApiController {
         }
     }
 
+    /**
+     * 核酸（单人单管[仅黄码人员]）申请
+     *
+     * @param patientId
+     * @return
+     */
+    @RequestMapping(value = "/nucleicOnlyYellowAcidApplication", method = {RequestMethod.GET})
+    public Map<String, Object> nucleicOnlyYellowAcidApplication(@RequestParam("patientId") String patientId, HttpServletRequest httpServletRequest) {
+        Map<String, Object> results = new HashMap<>();
+        try {
+            String ip = HttpUtil.getIPAddress(httpServletRequest);
+            WhiteList whiteList = whiteListService.queryByIpAddress(ip);
+            if (whiteList == null) {
+                results.put("resultCode", -1);
+                results.put("resultMessage", "当前请求来源未在白名单中【" + ip + "】");
+                return results;
+            }
+            if (StringUtils.isBlank(patientId)) {
+                results.put("resultCode", -1);
+                results.put("resultMessage", "患者ID不能为空");
+                return results;
+            }
+            Clinic clinic = mzChargeDetailService.nucleicOnlyYellowAcidApplication(patientId, whiteList.getOpId());
+            if (clinic != null && clinic.getId() != null) {
+                MzDepositFileVo mzDepositFileVo=new MzDepositFileVo();
+                mzDepositFileVo.setPatientId(clinic.getPatientId());
+                mzDepositFileVo.setTimes(clinic.getTimes());
+                mzDepositFileVo.setReceiptNo(clinic.getReceiptNo());
+                MzDepositFile mzDepositFile = new MzDepositFile();
+                mzDepositFile.setChequeType(Constants.CASH);
+                mzDepositFile.setAmount(BigDecimal.ZERO);
+                mzDepositFile.setResponceType(Constants.NUCLEIC_ONLY_YELLOW_ACID_APPLICATION);
+                mzDepositFileVo.setMzDepositFiles(Arrays.asList(mzDepositFile));
+                mzChargeDetailService.chargeFee(Constants.BRZZJF_CODE, mzDepositFileVo, Constants.BRZZJF_CODE);
+                results.put("resultCode", 0);
+                results.put("resultMessage", "核酸（单人单管[仅黄码人员]）申请保存成功");
+                return results;
+            }
+            results.put("resultCode", -1);
+            results.put("resultMessage", "核酸（单人单管[仅黄码人员]）申请保存失败");
+            return results;
+        } catch (MzException e) {
+            results.put("resultCode", -1);
+            results.put("resultMessage", e.getMessage());
+            log.error("系统异常，错误信息{}", e);
+            return results;
+        } catch (Exception e) {
+            e.printStackTrace();
+            results.put("resultCode", -1);
+            results.put("resultMessage", "核酸（单人单管[仅黄码人员]）申请保存失败，请联系管理员");
+            log.error("系统异常，错误信息{}", e);
+            return results;
+        }
+    }
 
     /**
      * 核酸（单人单管）申请

src/main/java/cn/hnthyy/thmz/service/his/mz/MzChargeDetailService.java

@@ -317,6 +317,13 @@ public interface MzChargeDetailService {
      */
     Clinic hybridTestApplication(String patientId,String opId) throws MzException;
 
+    /**
+     * 核酸检测（单人 仅黄码使用，无需缴费）
+     *
+     * @param patientId
+     * @return
+     */
+    Clinic nucleicOnlyYellowAcidApplication(String patientId,String opId) throws MzException;
 
     /**
      * 核酸检测（混检）开处方，只生成医技申请不收费

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

@@ -1426,6 +1426,11 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                         zlDetail.put("index", index);
                         zlDetail.put("orderCode", mzChargeDetail.getChargeItemCode());
                         zlDetail.put("name", mzChargeDetail.getTcName());
+                        zlDetail.put("drugQuan",mzChargeDetail.getDrugQuan());
+                        zlDetail.put("drugUnit",mzChargeDetail.getDrugUnit());
+                        zlDetail.put("orderDays",mzChargeDetail.getOrderDays());
+                        zlDetail.put("frequency",mzChargeDetail.getFrequency());
+                        zlDetail.put("quantity",mzChargeDetail.getQuantity());
                         if (StringUtils.isNotBlank(mzChargeDetail.getInstructionText())) {
                             zlDetail.put("instructionCode", mzChargeDetail.getInstructionCode());
                             zlDetail.put("instructionText", mzChargeDetail.getInstructionText());
@@ -2290,6 +2295,18 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
 
     @Override
     public Clinic nucleicAcidApplication(String patientId,String opId) throws MzException {
+        return getNucleicAcidApplication(patientId, opId,Constants.NUCLEIC_ORDER_CODE);
+    }
+
+    /**
+     * 核酸单人单管申请
+     * @param patientId
+     * @param opId
+     * @param orderCode
+     * @return
+     * @throws MzException
+     */
+    private Clinic getNucleicAcidApplication(String patientId, String opId,String orderCode) throws MzException {
         MzPatientMi mzPatientMi = mzPatientMiMapper.selectByPatientId(patientId);
         if (mzPatientMi == null) {
             throw new MzException("当前挂号的病人信息不存在，请先保存病人信息！");
@@ -2329,7 +2346,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         mzBlRecord.setTemperature(0D);
         mzPrescriptionVo.setMzBlRecord(mzBlRecord);
         MzYjReq mzYjReq = new MzYjReq();
-        mzYjReq.setOrderCode(Constants.NUCLEIC_ORDER_CODE);
+        mzYjReq.setOrderCode(orderCode);
         mzYjReq.setInspectStuff(Constants.NUCLEIC_INSPECT_STUFF);
         mzYjReq.setOrderNo(1);
         mzYjReq.setJyRemark("申请核酸检测（单人单管）");
@@ -2401,6 +2418,11 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         return savePrescription(mzPrescriptionVo, null);
     }
 
+    @Override
+    public Clinic nucleicOnlyYellowAcidApplication(String patientId, String opId) throws MzException {
+        return getNucleicAcidApplication(patientId, opId,Constants.NUCLEIC_ORDER_ONLY_YELLOW_CODE);
+    }
+
     @Override
     public Clinic hybridTestOnlyYjReq(String patientId) throws MzException {
         MzPrescriptionVo mzPrescriptionVo = new MzPrescriptionVo();
@@ -3823,7 +3845,10 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         BigDecimal ybjzje = BigDecimal.ZERO;
         for (MzDepositFile m : mzDepositFileVo.getMzDepositFiles()) {
             if (BigDecimal.ZERO.compareTo(m.getAmount()) == 0) {
-                throw new MzException("存在收款金额为0的支付方式，请重新确认！");
+                if(!Constants.NUCLEIC_ONLY_YELLOW_ACID_APPLICATION.equals(m.getResponceType())){
+                    throw new MzException("存在收款金额为0的支付方式，请重新确认！");
+                }
+                m.setResponceType(null);
             }
             if (m.getPatientId() == null) {
                 //此时是直接收费，需要设置相关参数

src/main/java/cn/hnthyy/thmz/service/impl/thmz/OrderStatusChangeServiceImpl.java

@@ -143,7 +143,7 @@ public class OrderStatusChangeServiceImpl implements OrderStatusChangeService {
                     return;
                 }
                 Config config= configService.queryUserByKey(Constants.MESSAGE_TO_PHONE);
-                String messageToPhone=(config==null || StringUtils.isBlank(config.getConfigValue()))?"抽血室在一楼急诊科，大小便标本在门诊大楼三楼医学检验科，一楼急诊科的核酸采样室。":config.getConfigValue();
+                String messageToPhone=(config==null || StringUtils.isBlank(config.getConfigValue()))?"抽血室在一楼急诊科，大小便标本在门诊大楼三楼医学检验科，绿码核酸采样室在一楼急诊科或前坪采样点，黄码采样点在发热门诊。":config.getConfigValue();
                 for (String str : execDeps) {
                     zdUnitCode = zdUnitCodeService.queryByCode(str);
                     if (zdUnitCode == null) {

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

@@ -45,6 +45,8 @@ $(function () {
     init_validator();
     //初始频次下拉选
     initOrderFrequencys("orderFrequency", true);
+    //初始频次下拉选
+    initOrderFrequencys("orderFrequencyZl", true);
     //初始用药方式下拉选
     initSupplyTypes();
 
@@ -452,14 +454,28 @@ $(function () {
                 saveJyJcItem(true);
                 $("#jcJyItem").focus();
             } else if (id == 'chargeUnit') {
+                $("#itemQuantity").focus();
+            } else if (id == 'itemQuantity') {
+                $("#dayZlNum").next().click();
+            } else if (id == 'dayZlNum') {
+                var ariaExpanded = $("#dayZlNum").next().attr("aria-expanded");
+                if (ariaExpanded == true || ariaExpanded == "true") {
+                    $("#dayZlNum").next().click();
+                }
+                $("#orderFrequencyZl").next().click();
+            } else if (id == 'orderFrequencyZl') {
+                var ariaExpanded = $("#orderFrequencyZl").next().attr("aria-expanded");
+                if (ariaExpanded == true || ariaExpanded == "true") {
+                    $("#orderFrequencyZl").next().click();
+                }
+                $("#totalNumZl").focus();
+            } else if (id == 'totalNumZl') {
                 $("#zlExecUnit").next().click();
             } else if (id == 'zlExecUnit') {
                 var ariaExpanded = $("#zlExecUnit").next().attr("aria-expanded");
                 if (ariaExpanded == true || ariaExpanded == "true") {
                     $("#zlExecUnit").next().click();
                 }
-                $("#itemQuantity").focus();
-            } else if (id == 'itemQuantity') {
                 $("#zlRemark").focus();
             } else if (id == 'zlRemark') {
                 saveZlItem(true);
@@ -812,6 +828,8 @@ function initDayNum() {
     }
     $('#dayNum').html(html);
     $('#dayNum').selectpicker('refresh');
+    $('#dayZlNum').html(html);
+    $('#dayZlNum').selectpicker('refresh');
 }
 
 /**
@@ -2068,6 +2086,7 @@ function clearWorkSpaceExcludeUser(source) {
         clearWesternMedicine(true);
         clearChineseMedicine();
         clearJyJcItem();
+        clearZlItem();
         clearZyReq();
         //initNavTabs(0);
         clearNavTabs(0);
@@ -2263,6 +2282,26 @@ function fitJcjyContent(jcjyPrescription, contentId, titleId, checkBox) {
         }
         jcjyHtml += jcjy.index + ".";
         jcjyHtml += jcjy.name;
+        var drugUnit = jcjy.drugUnit;
+        if (drugUnit == undefined || drugUnit == null || drugUnit == "") {
+            drugUnit = "";
+        }
+        var drugQuan = jcjy.drugQuan;
+        if (drugQuan != undefined && drugQuan != null && drugQuan != "") {
+            jcjyHtml += " 单量:" + drugQuan+drugUnit;
+        }
+        var orderDays = jcjy.orderDays;
+        if (orderDays != undefined && orderDays != null && orderDays != "") {
+            jcjyHtml += " 天数:" + orderDays+"天";
+        }
+        var frequency = jcjy.frequency;
+        if (frequency != undefined && frequency != null && frequency != "") {
+            jcjyHtml += " 频次:" + frequency;
+        }
+        var quantity = jcjy.quantity;
+        if (quantity != undefined && quantity != null && quantity != "") {
+            jcjyHtml += " 总量:" + quantity+drugUnit;
+        }
         if (checkBox) {
             jcjyHtml += "</span>";
         }
@@ -2553,15 +2592,21 @@ function callBackZlDetail(code, mzChargeDetail) {
                 }
                 $("#zlItem").val(res.data.name);
                 $("#zlItem").blur();
+                $("#descriptions").val(res.data.descriptions);
                 $("#zlItemPrice").val(res.data.chargeAmount);
                 $("#chargeUnit").val(res.data.chargeUnit);
                 $("#zl_current_code").val(res.data.code);
                 $("#zlRemark").val(mzChargeDetail.instructionText);
+                $("#dayZlNum").selectpicker('val', mzChargeDetail.orderDays);
+                $('#dayZlNum').selectpicker('refresh');
+                $("#orderFrequencyZl").selectpicker('val', mzChargeDetail.frequency);
+                $('#orderFrequencyZl').selectpicker('refresh');
                 if (mzChargeDetail.execDept != null && mzChargeDetail.execDept != "") {
                     $("#zlExecUnit").selectpicker('val', mzChargeDetail.execDept);
                     $('#zlExecUnit').selectpicker('refresh');
                 }
-                $("#itemQuantity").val(mzChargeDetail.quantity);
+                $("#itemQuantity").val(mzChargeDetail.drugQuan);
+                $("#totalNumZl").val(mzChargeDetail.quantity);
                 saveZlItem(false);
             } else {
                 errorMesage(res);
@@ -4083,11 +4128,31 @@ function editZlItem(obj) {
     var itemQuantity = $(parentObject).find("input.temporary_items_itemQuantity").val();
     //执行科室
     var execUnit = $(parentObject).find("input.temporary_items_execUnit").val();
+
+    var descriptions = $(parentObject).find("input.temporary_items_code").val();
+    if (descriptions != null && descriptions != "" && descriptions != 'null') {
+        $("#descriptions").val(descriptions);
+    }
+    var dayZlNum = $(parentObject).find("input.temporary_items_dayZlNum").val();
+    if (dayZlNum != null && dayZlNum != "" && dayZlNum != 'null') {
+        $("#dayZlNum").selectpicker('val', dayZlNum);
+        $('#dayZlNum').selectpicker('refresh');
+    }
+    var orderFrequencyZl = $(parentObject).find("input.temporary_items_orderFrequencyZl").val();
+    if (orderFrequencyZl != null && orderFrequencyZl != "" && orderFrequencyZl != 'null') {
+        $("#orderFrequencyZl").selectpicker('val', orderFrequencyZl);
+        $('#orderFrequencyZl').selectpicker('refresh');
+    }
+    var totalNumZl = $(parentObject).find("input.temporary_items_totalNumZl").val();
+    if (totalNumZl != null && totalNumZl != "" && totalNumZl != 'null') {
+        $("#totalNumZl").val(totalNumZl);
+    }
     $("#zlExecUnit").selectpicker('val', execUnit);
     $('#zlExecUnit').selectpicker('refresh');
     //描述
     $("#chargeUnit").val(chargeUnit);
     $("#itemQuantity").val(itemQuantity);
+    calculateZl(true);
 }
 
 /**
@@ -4332,26 +4397,36 @@ function saveZlItemReal(calculateTotalAmountFlag) {
     var currentCode = $("#zl_current_code").val();
     //当前项目价格
     var zlItemPrice = $("#zlItemPrice").val();
-    //描述
+    //单位
     var chargeUnit = $("#chargeUnit").val();
     //执行科室
     var zlExecUnit = $("#zlExecUnit").val();
     //执行科室
     var zlExecUnitName = $('#zlExecUnit option:selected').text();
     zlExecUnitName = zlExecUnitName.substring(0, zlExecUnitName.indexOf("("));
-    //次数
+    //单量
     var itemQuantity = $("#itemQuantity").val();
+    //规格
+    var descriptions = $("#descriptions").val();
+    //天数
+    var dayZlNum = $("#dayZlNum").val();
+    //频次
+    var orderFrequencyZl = $("#orderFrequencyZl").val();
+    //总量
+    var totalNumZl = $("#totalNumZl").val();
     //描述编码
     var chargeUnitCode = chargeUnit;
-    var chargeUnitName = " 描述:";
     //备注
     var remark = $("#zlRemark").val();
-
-    if (currentCode == null || currentCode == '') {
-        if (calculateTotalAmountFlag == true) {
+    if (calculateTotalAmountFlag == true) {
+        if (currentCode == null || currentCode == '') {
             errorMesageSimaple("未选择任何项目！");
+            return;
+        }
+        if (totalNumZl == null || totalNumZl == "" || totalNumZl == "null") {
+            errorMesageSimaple("项目使用总量为空！");
+            return;
         }
-        return;
     }
     //判断是否有重复的项目  返回true 说明有重复的
     if (verifyRepeat(currentCode, null, null, 3)) {
@@ -4396,12 +4471,27 @@ function saveZlItemReal(calculateTotalAmountFlag) {
     var html = '<div class="form-group">';
     html += '<span class="zlItemGroupId">' + groupId + '</span>.<span style="margin-left: 5px"></span>'
     html += zlItem + ' ';
-    html += " 数量:" + itemQuantity;
-    if (zlExecUnit != null && zlExecUnit != "") {
-        html += " 执行科室:" + zlExecUnitName;
+    if (descriptions != null && descriptions != "") {
+        html += " 规格:" + descriptions;
     }
+    html += " 单量:" + itemQuantity;
     if (chargeUnit != null && chargeUnit != '') {
-        html += chargeUnitName + chargeUnit;
+        html += chargeUnit;
+    }
+    if (dayZlNum != null && dayZlNum != "") {
+        html += " 天数:" + dayZlNum+"天";
+    }
+    if (orderFrequencyZl != null && orderFrequencyZl != "") {
+        html += " 频次:" + orderFrequencyZl;
+    }
+    if (totalNumZl != null && totalNumZl != "") {
+        html += " 总量:" + totalNumZl;
+        if (chargeUnit != null && chargeUnit != '') {
+            html += chargeUnit;
+        }
+    }
+    if (zlExecUnit != null && zlExecUnit != "") {
+        html += " 执行科室:" + zlExecUnitName;
     }
     if (remark != null && remark != '') {
         html += ' 备注:' + remark;
@@ -4417,6 +4507,10 @@ function saveZlItemReal(calculateTotalAmountFlag) {
     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="' + zlExecUnit + '"/>';
+    html += '<input type="hidden" class="temporary_items_descriptions" value="' + descriptions + '"/>';
+    html += '<input type="hidden" class="temporary_items_dayZlNum" value="' + dayZlNum + '"/>';
+    html += '<input type="hidden" class="temporary_items_orderFrequencyZl" value="' + orderFrequencyZl + '"/>';
+    html += '<input type="hidden" class="temporary_items_totalNumZl" value="' + totalNumZl + '"/>';
     html += '</div>';
     //当没有下一个兄弟节点或者当前编辑的药品是最后一个时，直接添加
     if (nextObj == null || isLast) {
@@ -4798,6 +4892,13 @@ function clearZlItem() {
     //描述
     $("#chargeUnit").val(null);
     $("#itemQuantity").val(1);
+    $("#descriptions").val(null);
+    $("#dayZlNum").selectpicker('val', null);
+    $('#dayZlNum').selectpicker('refresh');
+    $("#orderFrequencyZl").selectpicker('val', null);
+    $('#orderFrequencyZl').selectpicker('refresh');
+    $("#totalNumZl").val(null);
+    $("#totalAmountZl").val(null);
     $("#zlExecUnit").selectpicker('val', null);
     $('#zlExecUnit').selectpicker('refresh');
 }
@@ -6377,6 +6478,9 @@ function loadZlItemList(event) {
             $("#chargeUnit").val(row.specification);
             $("#zl_current_code").val(row.code);
             $("#itemQuantity").val(1);
+            $("#descriptions").val(row.descriptions);
+            $("#descriptions").attr('title', row.descriptions);
+            calculateZl(false);
             $("#chargeUnit").focus();
             return;
         }
@@ -7774,7 +7878,12 @@ function getParamsForpPrescription(type) {
             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.quantity = $(zlTabContents[i]).find("input.temporary_items_totalNumZl").val();
+            tempJson.drugQuan = $(zlTabContents[i]).find("input.temporary_items_itemQuantity").val();
+            //因为收费表里的单位长度限制，无法存入库
+            //tempJson.drugUnit = $(zlTabContents[i]).find("input.temporary_items_desc_value").val();
+            tempJson.frequency = $(zlTabContents[i]).find("input.temporary_items_orderFrequencyZl").val();
+            tempJson.orderDays = $(zlTabContents[i]).find("input.temporary_items_dayZlNum").val();
             tempJson.orderNo = orderNo;
             tempJson.execDept = execUnit;
             jsonData.mzChargeDetailList[jsonData.mzChargeDetailList.length] = tempJson;
@@ -10937,4 +11046,37 @@ function consultationCliniced(patientId) {
 }
 
 
-
+/**
+ * 计算诊疗金额
+ * @param flag true ，直接计算总价， false 还要计算总量
+ */
+function calculateZl(flag) {
+    if (!flag) {
+        var itemQuantity = $("#itemQuantity").val();
+        if (itemQuantity == null) {
+            return;
+        }
+        var dayZlNum = $("#dayZlNum").val();
+        if (dayZlNum == null) {
+            return;
+        }
+        //频率
+        var times = $('#orderFrequencyZl').find("option:selected").attr('desc');
+        if (times == null) {
+            return;
+        }
+        var totalNumZl = Multiply(Multiply(itemQuantity, dayZlNum), times);
+        $("#totalNumZl").val(totalNumZl);
+    }
+    //总量
+    var totalNumZl = $("#totalNumZl").val();
+    if (totalNumZl == null) {
+        return;
+    }
+    //单价
+    var zlItemPrice = $("#zlItemPrice").val();
+    if (zlItemPrice == null) {
+        return;
+    }
+    $("#totalAmountZl").val(Multiply(totalNumZl, zlItemPrice).toFixed(2));
+}

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

@@ -614,11 +614,6 @@
                                                     id="orderFrequency">
                                             </select>
                                         </div>
-                                        <!--<div class="checkbox hide" style="margin-left: 15px;width: 55px;float: left;">-->
-                                            <!--<label style="padding-left: 0px;">-->
-                                                <!--<input type="checkbox" class="flat" id="tryFlag">&nbsp;&nbsp;皮试-->
-                                            <!--</label>-->
-                                        <!--</div>-->
                                         <div class="hide" style="margin-left: 13px;width: 85px;float: left;">
                                             <label style="padding-left: 0px;">
                                                 <select class="form-control selectpicker show-tick"
@@ -919,6 +914,19 @@
                                         </div>
                                     </div>
                                 </div>
+                                <div class="item form-group">
+                                    <div style="width: 130px;float: left;">
+                                        <label class="my_label_2">规格：</label>
+                                        <input type="text" class="form-control my_label_input_2" id="descriptions"
+                                               style="padding-left: 10px;" readonly>
+                                    </div>
+                                    <div style="width: 256px;float: left;">
+                                        <label class="my_label">单位：</label>
+                                        <input type="text" class="form-control my_label_input_2" id="chargeUnit"
+                                               style="padding-left: 10px;" readonly>
+                                    </div>
+                                    <input type="hidden" id="zltype"/>
+                                </div>
                                 <div class="item form-group">
                                     <div style="width: 130px;float: left;">
                                         <label class="my_label_2">单价：</label>
@@ -926,28 +934,53 @@
                                                style="padding-left: 10px;" readonly>
                                     </div>
                                     <div style="width: 256px;float: left;">
-                                        <label class="my_label">描述<span
+                                        <label class="my_label">单量：</label>
+                                        <input type="number" class="form-control my_label_input_2" id="itemQuantity"  onchange="calculateZl(false)"
+                                               style="padding-left: 10px;">
+                                    </div>
+                                </div>
+                                <div class="item form-group">
+                                    <div style="width: 130px;float: left;">
+                                        <label class="my_label_2">天数<span
                                                 class="required">*</span>：</label>
-                                        <input type="text" class="form-control my_label_input_2" id="chargeUnit"
-                                               style="padding-left: 10px;" required="required">
+                                        <div style="width: 85px;float: left;">
+                                            <select class="form-control selectpicker show-tick" data-live-search="true" onchange="calculateZl(false)"
+                                                    title="请选择"
+                                                    id="dayZlNum">
+                                            </select>
+                                        </div>
+                                    </div>
+                                    <div style="width: 256px;float: left;">
+                                        <label class="my_label">频次：</label>
+                                        <div style="width: 85px;float: left;">
+                                            <select class="form-control selectpicker show-tick"
+                                                    title="请选择" data-live-search="true" onchange="calculateZl(false)"
+                                                    id="orderFrequencyZl">
+                                            </select>
+                                        </div>
                                     </div>
-                                    <input type="hidden" id="zltype"/>
                                 </div>
                                 <div class="item form-group">
+                                    <div style="width: 130px;float: left;">
+                                        <label class="my_label_2">总量：</label>
+                                        <input type="text" class="form-control my_label_input_2" id="totalNumZl" onkeyup="calculateZl(true)"
+                                               style="padding-left: 10px;">
+                                    </div>
                                     <div style="width: 256px;float: left;">
+                                        <label class="my_label">总价：</label>
+                                        <input type="text" class="form-control my_label_input_2" id="totalAmountZl"
+                                               style="padding-left: 10px;" readonly>
+                                    </div>
+                                </div>
+                                <div class="item form-group">
+                                    <div style="width: 100%;float: left;">
                                         <label class="my_label_2" style="width: 70px;">执行科室：</label>
-                                        <div style="width: 163px;float: left;">
+                                        <div style="width: 315px;float: left;">
                                             <select class="form-control selectpicker show-tick" data-live-search="true"
                                                     id="zlExecUnit">
                                             </select>
                                         </div>
                                     </div>
-
-                                    <div style="width: 130px;float: left;">
-                                        <label class="my_label" style="width: 40px;">数量：</label>
-                                        <input type="number" class="form-control my_label_input_2" id="itemQuantity"
-                                               style="padding-left: 10px;">
-                                    </div>
                                 </div>
                                 <div class="item form-group">
                                     <div style="width: 100%">