增加核酸单采时间和人数设置

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

@@ -1524,8 +1524,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     }
                     if (StringUtils.isNotBlank(mzChargeDetail.getTryFlag()) && YesNoEnum.YES.code.toString().equals(mzChargeDetail.getTryFlag())) {
                         xyDetail.put("tryFlag", "皮试");
-                    }
-                    if (StringUtils.isNotBlank(mzChargeDetail.getTryResult())) {
+                    }else if (StringUtils.isNotBlank(mzChargeDetail.getTryResult())) {
                         if (MzChargeDetail.NEGATIVE_TRY_RESULT.equals(mzChargeDetail.getTryResult())) {
                             xyDetail.put("tryResult", "阴性");
                         } else if (MzChargeDetail.EXCUSED_EXAMINATION_TRY_RESULT.equals(mzChargeDetail.getTryResult())) {

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

@@ -8157,7 +8157,7 @@ function getParamsForpPrescription(type) {
             if (formGroups != null && formGroups.length > 0) {
                 for (var j = 0; j < formGroups.length; j++) {
                     var tempJson = JSON.parse('{"chargeItemCode": "","serial": "","quantity": "","drugQuan": "","drugUnit": "","frequency": "","orderDays": "","paySelf": "0","drugWin": "1","instructionCode":"",' +
-                        '"instructionText":"","orderNo":"","groupOrder":"","supplyCode":"","tryFlag":"0","tryResult":"0","groupNo":"","cyJssm":"","cyDj":"","cyFysm":"","cyJsl":"","cyZql":"","cyFj":"","cyFfcs":"","cyMtjs":""}');
+                        '"instructionText":"","orderNo":"","groupOrder":"","supplyCode":"","tryFlag":"","tryResult":"","groupNo":"","cyJssm":"","cyDj":"","cyFysm":"","cyJsl":"","cyZql":"","cyFj":"","cyFfcs":"","cyMtjs":""}');
                     tempJson.chargeItemCode = $(formGroups[j]).find("input.temporary_items_code").val();
                     tempJson.serial = $(formGroups[j]).find("input.temporary_items_serial").val();
                     tempJson.quantity = $(formGroups[j]).find("input.temporary_items_gross").val();

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

@@ -23,6 +23,11 @@ $(function () {
         exportExcel();
     });
 
+    //初始化页面上面的按钮事件
+    $("#btn_hybird").click(function (t) {
+        hybirdTimeModal();
+    });
+
     //打印检查检验报告单
     $('#btn_print').click(function () {
         printJyJcReport(1);
@@ -31,6 +36,23 @@ $(function () {
     $('#btn_print_setup').click(function () {
         printJyJcReport(2);
     });
+    initHybirdTimeSelect();
+
+
+    //提交核酸时间修改请求
+    $("#hybirdTime").on("click", function (t) {
+        $("#hybirdTimeModal").modal("hide");
+        $("#messageModal").modal();
+        $("#messageButton").removeClass("hide");
+        $("#messageContent").html("确定要修改单人单管采样时间/最大采样数吗？");
+        $("#messageButton").off("click").on("click", function (t) {
+            $("#messageModal").modal("hide");
+            updateHyBirdTime();
+        });
+        $("#cancelButton").off("click").on("click", function (t) {
+            $("#hybirdTimeModal").modal();
+        });
+    });
 });
 
 
@@ -597,3 +619,172 @@ function printJyJcReport(printType) {
         LODOP.PRINT_SETUP();
     }
 }
+
+
+
+
+
+
+
+/**
+ * 初始化混采时间下拉选
+ */
+function initHybirdTimeSelect() {
+    $(".selectpicker").selectpicker({
+        dropuAuto: false,
+        size: 8
+    });
+    var hourHtml = '';
+    for (var i = 0; i < 24; i++) {
+        var key = '';
+        if (i < 10) {
+            key = '0' + i;
+        } else {
+            key = i;
+        }
+        hourHtml += '<option value="' + key + '">' + key + '</option>';
+    }
+    $('#hybirdBeginTimeHour').html(hourHtml);
+    $('#hybirdBeginTimeHour').selectpicker('refresh');
+    $('#hybirdEndTimeHour').html(hourHtml);
+    $('#hybirdEndTimeHour').selectpicker('refresh');
+    var minuteHtml = '';
+    for (var i = 0; i < 60; i++) {
+        var key = '';
+        if (i < 10) {
+            key = '0' + i;
+        } else {
+            key = i;
+        }
+        minuteHtml += '<option value="' + key + '">' + key + '</option>';
+    }
+    $('#hybirdBeginTimeMinute').html(minuteHtml);
+    $('#hybirdBeginTimeMinute').selectpicker('refresh');
+    $('#hybirdEndTimeMinute').html(minuteHtml);
+    $('#hybirdEndTimeMinute').selectpicker('refresh');
+}
+
+
+/**
+ * 打开核酸混检时间设置
+ */
+function hybirdTimeModal() {
+    $('#hybirdEndTimeMinute').selectpicker('refresh');
+    $("#hybirdTimeModal").modal();
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getConfigByKey?key=single_hybird_time',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                var hybirdTime=res.data.configValue;
+                if(hybirdTime!=null && hybirdTime!=""){
+                    var hybirdTimeArr = hybirdTime.split("-");
+                    if(hybirdTimeArr!=null && hybirdTimeArr.length==2){
+                        try{
+                            var beginTime = hybirdTimeArr[0];
+                            var endTime = hybirdTimeArr[1];
+                            var beginTimeArr = beginTime.split(":");
+                            var endTimeArr = endTime.split(":");
+                            $('#hybirdBeginTimeHour').selectpicker('val', beginTimeArr[0]);
+                            $('#hybirdBeginTimeHour').selectpicker('refresh');
+                            $('#hybirdBeginTimeMinute').selectpicker('val', beginTimeArr[1]);
+                            $('#hybirdBeginTimeMinute').selectpicker('refresh');
+                            $('#hybirdEndTimeHour').selectpicker('val', endTimeArr[0]);
+                            $('#hybirdEndTimeHour').selectpicker('refresh');
+                            $('#hybirdEndTimeMinute').selectpicker('val', endTimeArr[1]);
+                            $('#hybirdEndTimeMinute').selectpicker('refresh');
+                        }catch (e) {
+                            console.log(e);
+                            warningMesageSimaple("单人单管采样时间格式错误！");
+                            return;
+                        }
+
+                    }
+                }
+            }
+        }
+    });
+    $.ajax({
+        type: "GET",
+        url: '/thmz/getConfigByKey?key=single_hybird_number',
+        contentType: "application/json;charset=UTF-8",
+        dataType: "json",
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                var singleHybirdNumber=res.data.configValue;
+                $("#singleHybirdNumber").val(singleHybirdNumber);
+            }
+        }
+    });
+}
+
+
+
+
+
+
+
+
+
+
+
+/**
+ * 提交核酸更新时间请求
+ */
+function updateHyBirdTime() {
+    var hybirdBeginTimeHour=$('#hybirdBeginTimeHour').val();
+    var hybirdBeginTimeMinute=$('#hybirdBeginTimeMinute').val();
+    var hybirdEndTimeHour=$('#hybirdEndTimeHour').val();
+    var hybirdEndTimeMinute=$('#hybirdEndTimeMinute').val();
+    var hybirdTime=hybirdBeginTimeHour+":"+hybirdBeginTimeMinute+"-"+hybirdEndTimeHour+":"+hybirdEndTimeMinute;
+    $.ajax({
+        type: "POST",
+        contentType: "application/json;charset=UTF-8",
+        url: '/thmz/setConfig',
+        dataType: "json",
+        data: JSON.stringify({"configKey": "single_hybird_time","configValue": hybirdTime}),
+        headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+        success: function (res) {
+            if (res == '401' || res == 401) {
+                window.location.href = '/thmz/login/view'
+                return;
+            }
+            if (res.code == 0) {
+                var singleHybirdNumber=$('#singleHybirdNumber').val();
+                $.ajax({
+                    type: "POST",
+                    contentType: "application/json;charset=UTF-8",
+                    url: '/thmz/setConfig',
+                    dataType: "json",
+                    data: JSON.stringify({"configKey": "single_hybird_number","configValue": singleHybirdNumber}),
+                    headers: {'Accept': 'application/json', 'Authorization': 'Bearer ' + localStorage.getItem("token")},
+                    success: function (res) {
+                        if (res == '401' || res == 401) {
+                            window.location.href = '/thmz/login/view'
+                            return;
+                        }
+                        if (res.code == 0) {
+                            successMesage(res);
+                        } else {
+                            errorMesage(res);
+                        }
+                    }
+                });
+            } else {
+                errorMesage(res);
+            }
+        }
+    });
+}

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

@@ -208,7 +208,7 @@ function initGenderSelect() {
  * 初始化混检类型下拉选
  */
 function initHybirdTypeSelect() {
-    var html = '<option value="10">10人混采</option><option value="20">20人混采</option>';
+    var html = '<option value="5">5人混采</option><option value="10">10人混采</option><option value="20">20人混采</option>';
     $('#hybirdType').html(html);
     $('#hybirdType').selectpicker('refresh');
 }

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

@@ -55,6 +55,9 @@
                             <button type="button"  id="btn_excel" class="btn btn-primary"
                                     title="导出EXCEL"><i class="fa fa-file-excel-o"></i>
                             </button>
+                            <button type="button"  id="btn_hybird" class="btn btn-primary"
+                                    title="单检管数/时间设置"><i class="fa fa-cog"></i>
+                            </button>
                         </div>
                     </div>
                 </form>
@@ -186,6 +189,117 @@
 </div>
 <!--检验报告弹窗结尾-->
 
+
+<!--单检管数/时间设置弹窗开始-->
+<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="hybirdTimeModal">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content" style="width: 700px;margin-left: 200px;">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
+                </button>
+                <h4 class="modal-title modal-title-thmz">请根据实际安排调整核酸单人单管采样时间和总数</span>
+                </h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal form-label-left" novalidate>
+                    <div class="col-md-8 col-sm-8 col-xs-12 item form-group">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="hybirdBeginTimeHour">开始时间(时)
+                            <span
+                                    class="required">*</span>
+                        </label>
+                        <div class="col-md-8 col-sm-8 col-xs-12">
+                            <select class="form-control selectpicker show-tick" required="required" title="请选择单人单管采样开始时间的时钟参数"
+                                    id="hybirdBeginTimeHour">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-md-8 col-sm-8 col-xs-12 item form-group">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="hybirdBeginTimeMinute">开始时间(分)
+                            <span
+                                    class="required">*</span>
+                        </label>
+                        <div class="col-md-8 col-sm-8 col-xs-12">
+                            <select class="form-control selectpicker show-tick" required="required"  title="请选择单人单管采样开始时间的分钟参数"
+                                    id="hybirdBeginTimeMinute">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-md-8 col-sm-8 col-xs-12 item form-group">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="hybirdEndTimeHour">结束时间(时)
+                            <span
+                                    class="required">*</span>
+                        </label>
+                        <div class="col-md-8 col-sm-8 col-xs-12">
+                            <select class="form-control selectpicker show-tick" required="required"  title="请选择单人单管采样结束时间的时钟参数"
+                                    id="hybirdEndTimeHour">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-md-8 col-sm-8 col-xs-12 item form-group">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="hybirdEndTimeMinute">结束时间(分)
+                            <span
+                                    class="required">*</span>
+                        </label>
+                        <div class="col-md-8 col-sm-8 col-xs-12">
+                            <select class="form-control selectpicker show-tick" required="required"  title="请选择单人单管采样结束时间的分钟参数"
+                                    id="hybirdEndTimeMinute">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-md-8 col-sm-8 col-xs-12 item form-group">
+                        <label class="control-label col-md-4 col-sm-4 col-xs-12" for="hybirdEndTimeMinute">最大采样数
+                            <span
+                                    class="required">*</span>
+                        </label>
+                        <div class="col-md-8 col-sm-8 col-xs-12">
+                            <input id="singleHybirdNumber" class="form-control col-md-7 col-xs-12" title="请录入单日最大采样数" type="number" min="0" />
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" id="hybirdTime">保存</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--单检管数/时间设置弹窗结尾-->
+
+
+
+<!--提示弹窗开始-->
+<div class="modal fade bs-example-modal-sm in" tabindex="-1" role="dialog" aria-hidden="true" id="messageModal"
+     style="top:20%;">
+    <div class="modal-dialog modal-sm">
+        <div class="modal-content" style="width: 500px;">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span>
+                </button>
+                <h4 class="modal-title modal-title-thmz">提示</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal form-label-left" novalidate>
+                    <div class="col-md-2 col-sm-2 col-xs-12">
+                        <i class="fa fa-info-circle blue fa-3x"></i>
+                    </div>
+                    <div class="col-md-10 col-sm-10 col-xs-12"
+                         style="font-size: 14px;font-weight: 700;min-height: 39px;line-height: 39px;"
+                         id="messageContent">
+                        当前有病人正在接诊，是否切换?
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" id="messageButton">确定</button>
+                <button type="button" class="btn btn-default" id="cancelButton" data-dismiss="modal">取消
+                </button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--提示弹窗结尾-->
+
 <object id="LODOP_OB" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
 </object>