1、新增核酸申请混检申请

2、混检申请提交后需要创建一个混检主体的核酸采样的医技申请对应的处方并缴费，且缴费不产生结算报表数据

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

@@ -215,6 +215,13 @@ public class Constants {
      */
     public static final String DBZJF_CODE="99998";
 
+    /**
+     * 核酸检测混检收费员编码  （因为核酸混检是在每个人的时候收费，然后再集中一次去进行医技申请，
+     * 所以，医技申请的时候不能收费，但是系统需要进行收费操作，所以采用核酸收费员工号收费，这样可以进行收费操作，
+     * 改变了处方状态吗，又不进行日结，就不会影响报表）
+     */
+    public static final String HSJCHJSFY_CODE="99997";
+
     /**
      * 单病种收费员编码
      */
@@ -270,6 +277,12 @@ public class Constants {
      * 急诊科编码
      */
     public static final String EMERGENCY_WARD_CODE="1070000";
+
+    /**
+     * 医学检验科编码
+     */
+    public static final String MEDICAL_LABORATORY_CODE="2010000";
+
     /**
      * 医材药房
      */
@@ -323,10 +336,20 @@ public class Constants {
      */
     public static final String ZZBM="1400004";
     /**
-     * 核酸检测项目编码
+     * 核酸检测（单人单管）项目编码
      */
     public static final String NUCLEIC_ORDER_CODE ="003585";
 
+    /**
+     * 核酸检测收费项目（混检）编码
+     */
+    public static final String HYBRID_TEST_CHARGE_CODE ="019004";
+
+    /**
+     * 核酸检测项目（混检）编码
+     */
+    public static final String HYBRID_TEST_ORDER_CODE ="003680";
+
     /**
      * 核酸检测项目的检验物
      */

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

@@ -1063,7 +1063,7 @@ public class MedicalViewApiController {
 
 
     /**
-     * 核酸申请
+     * 核酸（单人单管）申请
      *
      * @param patientId
      * @return
@@ -1080,11 +1080,11 @@ public class MedicalViewApiController {
             Clinic clinic = mzChargeDetailService.nucleicAcidApplication(patientId);
             if (clinic != null && clinic.getId() != null) {
                 results.put("resultCode", 0);
-                results.put("resultMessage", "核酸申请保存成功");
+                results.put("resultMessage", "核酸申请（单人单管）保存成功");
                 return results;
             }
             results.put("resultCode", -1);
-            results.put("resultMessage", "核酸申请保存失败");
+            results.put("resultMessage", "核酸申请（单人单管）保存失败");
             return results;
         } catch (MzException e) {
             results.put("resultCode", -1);
@@ -1094,7 +1094,46 @@ public class MedicalViewApiController {
         } catch (Exception e) {
             e.printStackTrace();
             results.put("resultCode", -1);
-            results.put("resultMessage", "核酸申请保存失败，请联系管理员");
+            results.put("resultMessage", "核酸申请（单人单管）保存失败，请联系管理员");
+            log.error("系统异常，错误信息{}", e);
+            return results;
+        }
+    }
+
+
+    /**
+     * 核酸（混检）申请
+     *
+     * @param patientId
+     * @return
+     */
+    @RequestMapping(value = "/hybridTestApplication", method = {RequestMethod.GET})
+    public Map<String, Object> hybridTestApplication(@RequestParam("patientId") String patientId) {
+        Map<String, Object> results = new HashMap<>();
+        try {
+            if (StringUtils.isBlank(patientId)) {
+                results.put("resultCode", -1);
+                results.put("resultMessage", "患者ID不能为空");
+                return results;
+            }
+            Clinic clinic = mzChargeDetailService.hybridTestApplication(patientId);
+            if (clinic != null && clinic.getId() != null) {
+                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/controller/mz/MzChargeDetailController.java

@@ -1387,7 +1387,7 @@ public class MzChargeDetailController {
 
 
     /**
-     * 核酸申请
+     * 核酸申请（单人单管）
      *
      * @param patientId
      * @return
@@ -1425,6 +1425,46 @@ public class MzChargeDetailController {
         }
     }
 
+    /**
+     * 核酸申请（混检）
+     *
+     * @param patientId
+     * @return
+     */
+    @UserLoginToken
+    @RequestMapping(value = "/hybridTestApplication", method = {RequestMethod.GET})
+    public Map<String, Object> hybridTestApplication(@RequestParam("patientId") String patientId) {
+        Map<String, Object> results = new HashMap<>();
+        try {
+            if (StringUtils.isBlank(patientId)) {
+                results.put("code", -1);
+                results.put("message", "患者ID不能为空");
+                return results;
+            }
+            Clinic clinic = mzChargeDetailService.hybridTestApplication(patientId);
+            if (clinic != null && clinic.getId() != null) {
+                results.put("code", 0);
+                results.put("message", "核酸申请保存成功");
+                return results;
+            }
+            results.put("code", -1);
+            results.put("message", "核酸申请保存失败");
+            return results;
+        } catch (MzException e) {
+            results.put("code", -1);
+            results.put("message", e.getMessage());
+            log.error("系统异常，错误信息{}", e);
+            return results;
+        } catch (Exception e) {
+            e.printStackTrace();
+            results.put("code", -1);
+            results.put("message", "核酸申请保存失败，请联系管理员");
+            log.error("系统异常，错误信息{}", e);
+            return results;
+        }
+    }
+
+
     /**
      * 保存处方信息
      *

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

@@ -289,12 +289,27 @@ public interface MzChargeDetailService {
     Clinic savePrescription(MzPrescriptionVo mzPrescriptionVo,Clinic dbClinic) throws MzException;
 
     /**
-     * 核酸检测
+     * 核酸检测（单人）
      * @param patientId
      * @return
      */
     Clinic nucleicAcidApplication(String patientId) throws MzException;
 
+    /**
+     * 核酸检测（混检）开处方收费，只收费不生成医技申请
+     * @param patientId
+     * @return
+     */
+    Clinic hybridTestApplication(String patientId) throws MzException;
+
+
+    /**
+     * 核酸检测（混检）开处方，只生成医技申请不收费
+     * @param patientId
+     * @return
+     */
+    Clinic hybridTestOnlyYjReq(String patientId) throws MzException;
+
     /**
      * 查询药房类型
      * @param

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

@@ -2022,14 +2022,14 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         MzPrescriptionVo mzPrescriptionVo = new MzPrescriptionVo();
         mzPrescriptionVo.setPatientId(patientId);
         mzPrescriptionVo.setIcdCode("");
-        mzPrescriptionVo.setIcdText("申请核酸检测");
+        mzPrescriptionVo.setIcdText("申请核酸检测（单人单管）");
         mzPrescriptionVo.setDoctorCode(Constants.BRZZJF_CODE);
         mzPrescriptionVo.setVisitDeptCode(Constants.ZZBM);
         mzPrescriptionVo.setJzFlag(YesNoEnum.NO.code);
         mzPrescriptionVo.setFirstOrNot(YesNoEnum.NO.code);
         MzBlRecord mzBlRecord = new MzBlRecord();
         mzBlRecord.setFirstOrNot(YesNoEnum.NO.code.toString());
-        mzBlRecord.setEmrChiefComplaint("申请核酸检测");
+        mzBlRecord.setEmrChiefComplaint("申请核酸检测（单人单管）");
         mzBlRecord.setEmrHpi("无");
         mzBlRecord.setEmrPs("无");
         mzBlRecord.setEmrPe("无");
@@ -2051,7 +2051,100 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         mzYjReq.setOrderCode(Constants.NUCLEIC_ORDER_CODE);
         mzYjReq.setInspectStuff(Constants.NUCLEIC_INSPECT_STUFF);
         mzYjReq.setOrderNo(1);
-        mzYjReq.setJyRemark("申请核酸检测");
+        mzYjReq.setJyRemark("申请核酸检测（单人单管）");
+        mzPrescriptionVo.setMzYjReqList(Arrays.asList(mzYjReq));
+        return savePrescription(mzPrescriptionVo, null);
+    }
+
+    @Override
+    public Clinic hybridTestApplication(String patientId) throws MzException {
+        MzPrescriptionVo mzPrescriptionVo = new MzPrescriptionVo();
+        mzPrescriptionVo.setPatientId(patientId);
+        mzPrescriptionVo.setIcdCode("");
+        mzPrescriptionVo.setIcdText("申请核酸检测（混检）");
+        mzPrescriptionVo.setDoctorCode(Constants.BRZZJF_CODE);
+        mzPrescriptionVo.setVisitDeptCode(Constants.ZZBM);
+        mzPrescriptionVo.setJzFlag(YesNoEnum.NO.code);
+        mzPrescriptionVo.setFirstOrNot(YesNoEnum.NO.code);
+        MzBlRecord mzBlRecord = new MzBlRecord();
+        mzBlRecord.setFirstOrNot(YesNoEnum.NO.code.toString());
+        mzBlRecord.setEmrChiefComplaint("申请核酸检测（混检）");
+        mzBlRecord.setEmrHpi("无");
+        mzBlRecord.setEmrPs("无");
+        mzBlRecord.setEmrPe("无");
+        mzBlRecord.setEmrFzjc("无");
+        mzBlRecord.setEmrProcess("无");
+        mzBlRecord.setEmrXyy("无");
+        mzBlRecord.setEmrYypg("无");
+        mzBlRecord.setEmrGnpg("无");
+        mzBlRecord.setEmrJkjy("无");
+        mzBlRecord.setPersonalHistory("");
+        mzBlRecord.setFamilyHistory("");
+        mzBlRecord.setObstericalHistory("");
+        mzBlRecord.setTentativeDiagnosis("");
+        mzBlRecord.setPrescriptionDetail("");
+        mzBlRecord.setWeight(0D);
+        mzBlRecord.setTemperature(0D);
+        mzPrescriptionVo.setMzBlRecord(mzBlRecord);
+        MzChargeDetail mzChargeDetail = new MzChargeDetail();
+        mzChargeDetail.setChargeItemCode(Constants.HYBRID_TEST_CHARGE_CODE);
+        mzChargeDetail.setSerial("");
+        mzChargeDetail.setQuantity(1D);
+        mzChargeDetail.setDrugQuan(1D);
+        mzChargeDetail.setDrugUnit("");
+        mzChargeDetail.setFrequency("");
+        mzChargeDetail.setOrderDays(1);
+        mzChargeDetail.setPaySelf("0");
+        mzChargeDetail.setDrugWin(1);
+        mzChargeDetail.setInstructionCode("");
+        mzChargeDetail.setInstructionText("");
+        mzChargeDetail.setOrderNo(1);
+        mzChargeDetail.setGroupOrder(0);
+        mzChargeDetail.setSupplyCode("");
+        mzChargeDetail.setCyJssm("");
+        mzChargeDetail.setCyDj("");
+        mzChargeDetail.setTryFlag(YesNoEnum.NO.code.toString());
+        mzChargeDetail.setGroupNo(Constants.YJ_GROUP_NO);
+        mzChargeDetail.setExecDept(Constants.MEDICAL_LABORATORY_CODE);
+        mzPrescriptionVo.setMzChargeDetailList(Arrays.asList(mzChargeDetail));
+        return savePrescription(mzPrescriptionVo, null);
+    }
+
+    @Override
+    public Clinic hybridTestOnlyYjReq(String patientId) throws MzException {
+        MzPrescriptionVo mzPrescriptionVo = new MzPrescriptionVo();
+        mzPrescriptionVo.setPatientId(patientId);
+        mzPrescriptionVo.setIcdCode("");
+        mzPrescriptionVo.setIcdText("申请核酸检测（混检）");
+        mzPrescriptionVo.setDoctorCode(Constants.BRZZJF_CODE);
+        mzPrescriptionVo.setVisitDeptCode(Constants.ZZBM);
+        mzPrescriptionVo.setJzFlag(YesNoEnum.NO.code);
+        mzPrescriptionVo.setFirstOrNot(YesNoEnum.NO.code);
+        MzBlRecord mzBlRecord = new MzBlRecord();
+        mzBlRecord.setFirstOrNot(YesNoEnum.NO.code.toString());
+        mzBlRecord.setEmrChiefComplaint("申请核酸检测（混检）");
+        mzBlRecord.setEmrHpi("无");
+        mzBlRecord.setEmrPs("无");
+        mzBlRecord.setEmrPe("无");
+        mzBlRecord.setEmrFzjc("无");
+        mzBlRecord.setEmrProcess("无");
+        mzBlRecord.setEmrXyy("无");
+        mzBlRecord.setEmrYypg("无");
+        mzBlRecord.setEmrGnpg("无");
+        mzBlRecord.setEmrJkjy("无");
+        mzBlRecord.setPersonalHistory("");
+        mzBlRecord.setFamilyHistory("");
+        mzBlRecord.setObstericalHistory("");
+        mzBlRecord.setTentativeDiagnosis("");
+        mzBlRecord.setPrescriptionDetail("");
+        mzBlRecord.setWeight(0D);
+        mzBlRecord.setTemperature(0D);
+        mzPrescriptionVo.setMzBlRecord(mzBlRecord);
+        MzYjReq mzYjReq = new MzYjReq();
+        mzYjReq.setOrderCode(Constants.HYBRID_TEST_ORDER_CODE);
+        mzYjReq.setInspectStuff(Constants.NUCLEIC_INSPECT_STUFF);
+        mzYjReq.setOrderNo(1);
+        mzYjReq.setJyRemark("申请核酸检测（混检）");
         mzPrescriptionVo.setMzYjReqList(Arrays.asList(mzYjReq));
         return savePrescription(mzPrescriptionVo, null);
     }

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

@@ -1,14 +1,24 @@
 package cn.hnthyy.thmz.service.impl.thmz;
 
+import cn.hnthyy.thmz.common.Constants;
 import cn.hnthyy.thmz.entity.MzException;
+import cn.hnthyy.thmz.entity.his.mz.MzChargeDetail;
+import cn.hnthyy.thmz.entity.his.mz.MzDepositFile;
 import cn.hnthyy.thmz.entity.his.mz.MzPatientMi;
+import cn.hnthyy.thmz.entity.thmz.Clinic;
 import cn.hnthyy.thmz.entity.thmz.HybirdTest;
 import cn.hnthyy.thmz.mapper.thmz.HybirdTestMapper;
+import cn.hnthyy.thmz.service.his.mz.MzChargeDetailService;
 import cn.hnthyy.thmz.service.thmz.HybirdTestService;
+import cn.hnthyy.thmz.vo.MzDepositFileVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
@@ -18,7 +28,10 @@ public class HybirdTestServiceImpl implements HybirdTestService {
     @SuppressWarnings("all")
     @Autowired
     private HybirdTestMapper hybirdTestMapper;
+    @Autowired
+    private MzChargeDetailService mzChargeDetailService;
     @Override
+    @Transactional(propagation = Propagation.REQUIRED, isolation = Isolation.DEFAULT, timeout = 36000, rollbackFor = Exception.class)
     public int saveTHybirdTest(MzPatientMi mzPatientMi) throws MzException {
         if(StringUtils.isBlank(mzPatientMi.getParentPatientId())){
             throw new MzException("操作失败，混检主体ID为空");
@@ -42,7 +55,30 @@ public class HybirdTestServiceImpl implements HybirdTestService {
             hybirdTest.setCreateDate(now);
             hybirdTestList.add(hybirdTest);
         }
-        return hybirdTestMapper.batchInsertTHybirdTest(hybirdTestList);
+        int num= hybirdTestMapper.batchInsertTHybirdTest(hybirdTestList);
+        if(num>0){
+            //保存完核酸混检主体与实际被检人信息后，需要创建对应的核酸检验的医技申请
+            Clinic clinic= mzChargeDetailService.hybridTestOnlyYjReq(mzPatientMi.getParentPatientId());
+            if(clinic!=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);
+                List<MzChargeDetail> mzChargeDetails=mzChargeDetailService.unPaidToFullChargeDetail(clinic.getPatientId(),clinic.getPatientName());
+                if(mzChargeDetails!=null && mzChargeDetails.size()>0){
+                    for(MzChargeDetail mzChargeDetail:mzChargeDetails){
+                        if(mzChargeDetail.getTimes().equals(clinic.getTimes())){
+                            mzDepositFile.setAmount(mzChargeDetail.getAmount());
+                        }
+                    }
+                }
+                mzDepositFileVo.setMzDepositFiles(Arrays.asList(mzDepositFile));
+                mzChargeDetailService.chargeFee(Constants.HSJCHJSFY_CODE, mzDepositFileVo,Constants.HSJCHJSFY_CODE);
+            }
+        }
+        return num;
     }
 
 

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

@@ -153,6 +153,21 @@ $(function () {
         chargeFeeNucleicAcid();
     });
 
+
+    /**
+     * 创建核酸检查（混检）处方并保存
+     */
+    $("#saveHybridTest").on("click", function (t) {
+        saveHybridTest();
+    });
+
+    /**
+     * 跳转到（混检）缴费界面
+     */
+    $("#chargeFeeHybridTest").on("click", function (t) {
+        chargeFeeHybridTest();
+    });
+
     /**
      * 清空
      */
@@ -1083,6 +1098,7 @@ function extracted(res) {
     }
     if (res.data.patientId != null && res.data.patientId != "") {
         $("#nucleicAcid").show();
+        $("#hybridTest").show();
         $("#editUser").show();
     }
     readonlyOrNot(true);
@@ -1654,6 +1670,7 @@ function clearRegistration() {
     $("#editUser").hide();
     $("#clearIcCardNo").hide();
     $("#nucleicAcid").hide();
+    $("#hybridTest").hide();
     //默认光标在卡号输入框
     $("#cardNo").focus();
     initMzWorkTime();
@@ -1868,15 +1885,26 @@ function setAge() {
 
 
 /**
- * 打开创建核酸检测处方弹窗
+ * 打开创建核酸检测（单人）处方弹窗
  */
 function nucleicAcid() {
-    $("#nucleicAcidTip").html("是否要给患者【" + $("#userName").val() + "】创建核酸检查申请？");
+    $("#nucleicAcidTip").html("是否要给患者【" + $("#userName").val() + "】创建核酸检查（单人单管）申请？");
     $("#saveNucleicAcid").removeClass("hide");
     $("#chargeFeeNucleicAcid").addClass("hide");
     $("#nucleicAcidModal").modal();
 }
 
+
+/**
+ * 打开创建核酸检测（混检）处方弹窗
+ */
+function hybridTest() {
+    $("#hybridTestTip").html("是否要给患者【" + $("#userName").val() + "】创建核酸检查（混检）申请？");
+    $("#saveHybridTest").removeClass("hide");
+    $("#chargeFeeHybridTest").addClass("hide");
+    $("#hybridTestModal").modal();
+}
+
 /**
  * 创建核酸检查处方并保存
  */
@@ -1906,7 +1934,7 @@ function saveNucleicAcid() {
                         }
                         if (res.code == 0) {
                             successMesage(res);
-                            $("#nucleicAcidTip").html("患者【" + $("#userName").val() + "】的核酸检查申请已经创建成功，是否立即缴费？");
+                            $("#nucleicAcidTip").html("患者【" + $("#userName").val() + "】的核酸检查（单人单管）申请已经创建成功，是否立即缴费？");
                             $("#chargeFeeNucleicAcid").removeClass("hide");
                             $("#saveNucleicAcid").addClass("hide");
                             //$("#nucleicAcidModal").modal("hide");
@@ -1934,4 +1962,65 @@ function chargeFeeNucleicAcid() {
         //不按传统的路径传值设置值，这个参数会在页面跳转的时候截断
         changeContent('/thmz/toll-administration?' + $("#patientId").val());
     }, 400);
+}
+
+
+
+
+/**
+ * 创建核酸检查（混检）处方并保存
+ */
+function saveHybridTest() {
+    $.ajax({
+        type: "GET",
+        url: '/thmz/identityCardVerification?patientId=' + $("#patientId").val(),
+        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) {
+                $.ajax({
+                    type: "GET",
+                    url: '/thmz/hybridTestApplication?patientId=' + $("#patientId").val(),
+                    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) {
+                            successMesage(res);
+                            $("#hybridTestTip").html("患者【" + $("#userName").val() + "】的核酸检查（混检）申请已经创建成功，是否立即缴费？");
+                            $("#chargeFeeHybridTest").removeClass("hide");
+                            $("#saveHybridTest").addClass("hide");
+                        } else {
+                            errorMesage(res);
+                        }
+                    }
+                });
+            } else {
+                errorMesage(res);
+            }
+        }
+    });
+
+}
+
+
+/**
+ * 跳转到（混检）缴费界面
+ */
+function chargeFeeHybridTest() {
+    $("#hybridTestModal").modal("hide");
+    //延时刷新页面，因为页面弹窗有遮掩，需要时间清除
+    setTimeout(function () {
+        //不按传统的路径传值设置值，这个参数会在页面跳转的时候截断
+        changeContent('/thmz/toll-administration?' + $("#patientId").val());
+    }, 400);
 }

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

@@ -57,7 +57,8 @@
                     <div class="clearRegistrationDiv">
                         <!--<a id="editPrint"><i class="fa fa-cog">&nbsp;打印设置</i></a>-->
                         <!--<a id="editWindows"><i class="fa fa-gears">&nbsp;窗口号设置</i></a>-->
-                        <a id="nucleicAcid" hidden onclick="nucleicAcid()"><i class="fa fa-eyedropper">&nbsp;核酸检测</i></a>
+                        <a id="nucleicAcid" hidden onclick="nucleicAcid()"><i class="fa fa-eyedropper">&nbsp;核酸检测（单人）</i></a>
+                        <a id="hybridTest" hidden onclick="hybridTest()"><i class="fa fa-eyedropper">&nbsp;核酸检测（混检）</i></a>
                         <a id="clearIcCardNo" hidden onclick="clearIcCardNo()"><i
                                 class="fa fa-chain-broken">&nbsp;销卡</i></a>
                         <a onclick="savePatient(false)" id="saveUser" hidden><i class="fa fa-user">&nbsp;患者建档</i></a>
@@ -1049,7 +1050,7 @@
             <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>
+                <h4 class="modal-title modal-title-thmz">核酸检测（单人单管）</h4>
             </div>
             <div class="modal-body">
                 <form class="form-horizontal form-label-left" novalidate>
@@ -1060,7 +1061,6 @@
                 </form>
             </div>
             <div class="modal-footer">
-                <input id="serialNo" type="hidden"/>
                 <button type="button" class="btn btn-primary" id="saveNucleicAcid">确定</button>
                 <button type="button" class="btn btn-primary hide" id="chargeFeeNucleicAcid">去缴费</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
@@ -1072,6 +1072,34 @@
 
 
 
+<!--核酸检测弹窗开始-->
+<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="hybridTestModal">
+    <div class="modal-dialog modal-lg">
+        <div class="modal-content" style="width: 480px;margin-top: 200px;margin-left: 100px;">
+            <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="item form-group">
+                        <label class="control-label col-md-12 col-sm-12 col-xs-12" id="hybridTestTip" style="text-align: left">
+                        </label>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-primary" id="saveHybridTest">确定</button>
+                <button type="button" class="btn btn-primary hide" id="chargeFeeHybridTest">去缴费</button>
+                <button type="button" class="btn btn-default" 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>