解决优惠后无法收费

src/main/java/cn/hnthyy/thmz/entity/his/mz/CrbMainCard.java

@@ -102,12 +102,12 @@ public class CrbMainCard implements Serializable {
     private String occupationCode;
 
     /**
-     * illStartDate
+     * 发病日期
      */
     private Date illStartDate;
 
     /**
-     * illFirstDate
+     * 诊断日期
      */
     private Date illFirstDate;
 
@@ -127,7 +127,7 @@ public class CrbMainCard implements Serializable {
     private String discharStatus;
 
     /**
-     * disDiagType
+     * 诊断依据
      */
     private String disDiagType;
 
@@ -152,22 +152,22 @@ public class CrbMainCard implements Serializable {
     private String reportOpera;
 
     /**
-     * reportDate
+     * 报告日期
      */
     private Date reportDate;
 
     /**
-     * anamnesis
+     * 既往史
      */
     private String anamnesis;
 
     /**
-     * contagion
+     * 甲类
      */
     private String contagion;
 
     /**
-     * contagionText
+     * 订正病名
      */
     private String contagionText;
 
@@ -177,12 +177,12 @@ public class CrbMainCard implements Serializable {
     private String socialNo;
 
     /**
-     * contagion2
+     * 乙类
      */
     private String contagion2;
 
     /**
-     * contagion3
+     * 丙类
      */
     private String contagion3;
 
@@ -192,12 +192,12 @@ public class CrbMainCard implements Serializable {
     private String opId;
 
     /**
-     * inputDt
+     * 填卡日期
      */
     private Date inputDt;
 
     /**
-     * deathDate
+     * 死亡日期
      */
     private Date deathDate;
 
@@ -207,7 +207,7 @@ public class CrbMainCard implements Serializable {
     private String caseType;
 
     /**
-     * vaccinate
+     * 分类1
      */
     private String vaccinate;
 
@@ -217,22 +217,22 @@ public class CrbMainCard implements Serializable {
     private String dcFlag;
 
     /**
-     * vaccinate2
+     * 分类2
      */
     private String vaccinate2;
 
     /**
-     * contagionQt
+     * 其他
      */
     private String contagionQt;
 
     /**
-     * cardRet
+     * 退卡原因
      */
     private String cardRet;
 
     /**
-     * reportTel
+     * 联系电话
      */
     private String reportTel;
 
@@ -244,7 +244,7 @@ public class CrbMainCard implements Serializable {
     private Date birthDate;
 
     /**
-     * remark
+     * 备注
      */
     private String remark;
 
@@ -289,42 +289,42 @@ public class CrbMainCard implements Serializable {
     private String configId;
 
     /**
-     * gyLcfx
+     * 临床分型
      */
     private String gyLcfx;
 
     /**
-     * gyByfx
+     * 病原分型
      */
     private String gyByfx;
 
     /**
-     * vAlt
+     * ALT
      */
     private String vAlt;
 
     /**
-     * vKHcv
+     * 抗-HCV
      */
     private String vKHcv;
 
     /**
-     * vZdhz
+     * 总胆红质
      */
     private String vZdhz;
 
     /**
-     * vHcvRna
+     * HCV-RNA
      */
     private String vHcvRna;
 
     /**
-     * vKHavigm
+     * 抗-HAVIgM
      */
     private String vKHavigm;
 
     /**
-     * vKHdvigm
+     * 抗-HDVIgM
      */
     private String vKHdvigm;
 
@@ -334,42 +334,42 @@ public class CrbMainCard implements Serializable {
     private String vHavRna;
 
     /**
-     * vKHdv
+     * 抗HDV
      */
     private String vKHdv;
 
     /**
-     * vHbsag
+     * HbsAg
      */
     private String vHbsag;
 
     /**
-     * vHdvRna
+     * HDV-RNA
      */
     private String vHdvRna;
 
     /**
-     * vKHbs
+     * 抗-HBs
      */
     private String vKHbs;
 
     /**
-     * vKHevigm
+     * 抗-HEVIgM
      */
     private String vKHevigm;
 
     /**
-     * vHbeag
+     * HBeAg
      */
     private String vHbeag;
 
     /**
-     * vKHev
+     * 抗HEV
      */
     private String vKHev;
 
     /**
-     * vKHbe
+     * 抗-HBe
      */
     private String vKHbe;
 
@@ -379,67 +379,68 @@ public class CrbMainCard implements Serializable {
     private String vHevRna;
 
     /**
-     * vKHbc
+     * 抗-HBc
      */
     private String vKHbc;
 
     /**
-     * vKHbcigm
+     * 抗-HBcIgM
      */
     private String vKHbcigm;
 
     /**
-     * vHbvDna
+     * HBV-DNA
      */
     private String vHbvDna;
 
     /**
-     * gyDzbm
+     * 订正病名
      */
     private String gyDzbm;
 
     /**
-     * visitType
+     * 本次就诊
      */
     private String visitType;
 
     /**
-     * cTrust
+     * 患儿TRUST/RPR
      */
     private String cTrust;
 
     /**
-     * cRpr
+     * 患儿滴度
      */
     private String cRpr;
 
     /**
-     * cTppa
+     * 患儿TPPA/TPHA
      */
     private String cTppa;
 
     /**
-     * cTpha
+     * 患儿
+     19S-IgM-TPHA:
      */
     private String cTpha;
 
     /**
-     * mTrust
+     * TRUST/RPR
      */
     private String mTrust;
 
     /**
-     * mRpr
+     * 滴度
      */
     private String mRpr;
 
     /**
-     * mTppa
+     * TPPA/TPHA
      */
     private String mTppa;
 
     /**
-     * mOther
+     * 其他
      */
     private String mOther;
 

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

@@ -476,7 +476,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         //計算第二部位和DR费用
         setSecondPartAndDrFeeForCharge(mzChargeDetails, mzYjReqMap, tcNoMap, reqAmountMap, zdChargeItemMap);
         //预览的时候获取费用明细，需要打折，不是预览而是入库的时候不打折，因为入库后会有一次重新计算 计算惠民活动
-        formatPriceRoundDetail(mzChargeDetail, mzChargeDetails, mzPatientMi, mzChargeDetailList, maxOrderNo, itemNo, receiptNo, true);
+        formatPriceRoundDetail(mzChargeDetail, mzChargeDetails, mzPatientMi, mzChargeDetailList, maxOrderNo, itemNo, receiptNo, YesNoEnum.YES.equals(yesNo)?true:false);
         //yes 预览需要将原数据库中已存在的明细与临时生成的一起返回
         if (YesNoEnum.YES.equals(yesNo)) {
             for (MzChargeDetail mcd : mzChargeDetailList) {
@@ -756,7 +756,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
         //所有应收费用的明细 将所有费用按照类型归类
         Map<String, BigDecimal> feeMap = new HashMap<>();
         //实际应付金额
-        BigDecimal totalPayable = getTotalPayable(mzChargeDetailList, feeMap, false);
+        BigDecimal totalPayable = getTotalPayable(mzChargeDetailList, feeMap, true);
         //实际应付金额  四舍五入后的值 收费员收的钱小数点后只有一位有效值
         BigDecimal totalPayableRound = totalPayable.setScale(2, BigDecimal.ROUND_HALF_UP);
         //单病种收费不设置金额，所以自动设置金额
@@ -5156,7 +5156,7 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
             temp.addAll(mzChargeDetails);
         }
         if (temp != null && temp.size() > 0) {
-            BigDecimal totalFee = BigDecimal.ZERO;
+            //BigDecimal totalFee = BigDecimal.ZERO;
             //所有应收费用的明细 将所有费用按照类型归类
             Map<String, BigDecimal> feeMap = new HashMap<>();
             //实际应付金额

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

@@ -906,6 +906,39 @@ $(function () {
         minView: "1",  // 1 小时 2 日视图  3 月视图 4 年视图
         autoclose: true,//选中自动关闭
     });
+
+
+    //出生日期控件注册
+    $('#crbMainCardBirthDay').datetimepicker({
+        language: 'zh-CN',
+        format: 'yyyy-mm-dd',
+        minView: "month",
+        autoclose: true,//选中自动关闭
+    });
+
+    //发病日期控件注册
+    $('#illStartDate').datetimepicker({
+        language: 'zh-CN',
+        format: 'yyyy-mm-dd',
+        minView: "month",
+        autoclose: true,//选中自动关闭
+    });
+
+    //诊断日期控件注册
+    $('#illFirstDate').datetimepicker({
+        language: 'zh-CN',
+        format: 'yyyy-mm-dd',
+        minView: "month",
+        autoclose: true,//选中自动关闭
+    });
+
+    //死亡日期控件注册
+    $('#deathDate').datetimepicker({
+        language: 'zh-CN',
+        format: 'yyyy-mm-dd',
+        minView: "month",
+        autoclose: true,//选中自动关闭
+    });
 });
 
 /**
@@ -3719,6 +3752,244 @@ function initGenderSelect() {
         '<option value="31">学生</option><option value="37">现役军人</option><option value="51">自由职业者</option><option value="54">个体经营者</option><option value="70">无业人员</option><option value="80">退（离）休人员</option><option value="90">其他</option>';
     $('#occupationCode').html(occupationCode);
     $('#occupationCode').selectpicker('refresh');
+
+    //分类(1)
+    var vaccinate = '<option value="1">临床诊断</option><option value="2">实验室确诊</option><option value="3">疑似</option><option value="4">病原携带者</option>';
+    $('#vaccinate').html(vaccinate);
+    $('#vaccinate').selectpicker('refresh');
+
+    //分类(2)
+    var vaccinate2 = '<option value="1">急性</option><option value="2">慢性</option>';
+    $('#vaccinate2').html(vaccinate2);
+    $('#vaccinate2').selectpicker('refresh');
+
+
+    //甲类
+    var contagion = '<option value="0100">鼠疫</option><option value="0200">霍乱</option>';
+    $('#contagion').html(contagion);
+    $('#contagion').selectpicker('refresh');
+
+
+    //乙类
+    var classB = [
+        {code: '2002', name: '副伤寒'},
+        {code: '2001', name: '伤寒'},
+        {code: '0305', name: '肝炎（未分型）'},
+        {code: '0401', name: '细菌性痢疾'},
+        {code: '0402', name: '阿米巴性痢疾'},
+        {code: '0501', name: '伤寒'},
+        {code: '0502', name: '副伤寒'},
+        {code: '0600', name: '艾滋病'},
+        {code: '0700', name: '淋病'},
+        {code: '0801', name: '梅毒Ⅰ期'},
+        {code: '0802', name: '梅毒Ⅱ期'},
+        {code: '0803', name: '梅毒Ⅲ期'},
+        {code: '0804', name: '梅毒胎传'},
+        {code: '0805', name: '梅毒隐性'},
+        {code: '0900', name: '脊髓灰质炎'},
+        {code: '1000', name: '麻疹'},
+        {code: '1100', name: '百日咳'},
+        {code: '1200', name: '白喉'},
+        {code: '1400', name: '猩红热'},
+        {code: '1500', name: '流行性出血热'},
+        {code: '1600', name: '狂犬病'},
+        {code: '1700', name: '钩端螺旋体病'},
+        {code: '1800', name: '布鲁氏菌病'},
+        {code: '2100', name: '流行性乙型脑炎'},
+        {code: '2301', name: '间日疟'},
+        {code: '2302', name: '恶性疟'},
+        {code: '2303', name: '疟疾未分型'},
+        {code: '2400', name: '登革热'},
+        {code: '2500', name: '新生儿破伤风'},
+        {code: '2603', name: '肺结核未痰检'},
+        {code: '2604', name: '肺结核仅培阳'},
+        {code: '3100', name: '血吸虫病'},
+        {code: '5100', name: '不明原因肺炎'},
+        {code: '2702', name: '传染性非典型肺炎'},
+        {code: '0306', name: '甲型肝炎'},
+        {code: '0307', name: '乙型肝炎'},
+        {code: '0308', name: '丙型肝炎'},
+        {code: '0309', name: '戊型肝炎'},
+        {code: '5500', name: '人感染高致病性禽流感'},
+        {code: '1901', name: '肺炭疽'},
+        {code: '1902', name: '皮肤炭疽'},
+        {code: '1903', name: '未分型炭疽'},
+        {code: '2606', name: '肺结核涂阳'},
+        {code: '2607', name: '肺结核菌阴'},
+        {code: '5600', name: '流行性脑脊髓膜炎'},
+        {code: '5800', name: '甲型H1N1流感'},
+        {code: '9001', name: '新型冠状病毒肺炎'},
+        {code: '9002', name: '新型冠状病毒感染'},
+        {code: '9003', name: '新型冠状病毒肺炎临床诊断病例'},
+        {code: '9004', name: '新型冠状病毒肺炎疑似病例'},
+    ];
+    var contagion2 ='';
+    for(var i=0;i<classB.length;i++){
+        contagion2+='<option value="'+classB[i].code+'">'+classB[i].name+'</option>';
+    }
+    $('#contagion2').html(contagion2);
+    $('#contagion2').selectpicker('refresh');
+
+    //丙类
+    var classC = [
+        {code: '2200', name: '黑热病'},
+        {code: '3200', name: '丝虫病'},
+        {code: '3300', name: '包虫病'},
+        {code: '3400', name: '麻风病'},
+        {code: '3500', name: '流行性感冒'},
+        {code: '3600', name: '流行性腮腺炎'},
+        {code: '3700', name: '风疹'},
+        {code: '3800', name: '急性出血性结膜炎'},
+        {code: '3900', name: '其他感染性腹泻'},
+        {code: '5700', name: '流行性和地方性斑疹伤寒'},
+        {code: '5900', name: '手足口病'}
+    ];
+    var contagion3 ='';
+    for(var i=0;i<classC.length;i++){
+        contagion3+='<option value="'+classC[i].code+'">'+classC[i].name+'</option>';
+    }
+    $('#contagion3').html(contagion3);
+    $('#contagion3').selectpicker('refresh');
+
+
+   var otherInfections = [
+        {code: '4100', name: '非淋菌性尿道炎（衣原体）'},
+        {code: '4200', name: '尖锐湿疣'},
+        {code: '4300', name: '生殖器疱疹'},
+        {code: '5200', name: '水痘'},
+        {code: '5400', name: '肝吸虫病'},
+        {code: '4000', name: '生殖道沙眼衣原体感染'},
+        {code: '6000', name: '恙虫病'},
+        {code: '6100', name: '森林脑炎'},
+        {code: '6200', name: '结核性胸膜炎'},
+        {code: '6300', name: '人感染猪链球菌'},
+        {code: '6400', name: '人粒细胞无形体病'},
+    ];
+    var contagionQt ='';
+    for(var i=0;i<otherInfections.length;i++){
+        contagionQt+='<option value="'+otherInfections[i].code+'">'+otherInfections[i].name+'</option>';
+    }
+    $('#contagionQt').html(contagionQt);
+    $('#contagionQt').selectpicker('refresh');
+
+    var testing = [
+        {code: '0', name: '没检测'},
+        {code: '1', name: '阴性'},
+        {code: '2', name: '阳性'}
+    ];
+    var mTrust ='';
+    for(var i=0;i<testing.length;i++){
+        mTrust+='<option value="'+testing[i].code+'">'+testing[i].name+'</option>';
+    }
+    $('#mTrust').html(mTrust);
+    $('#mTrust').selectpicker('refresh');
+    $('#mTppa').html(mTrust);
+    $('#mTppa').selectpicker('refresh');
+
+    $('#cTrust').html(mTrust);
+    $('#cTrust').selectpicker('refresh');
+    $('#cTppa').html(mTrust);
+    $('#cTppa').selectpicker('refresh');
+    $('#cTpha').html(mTrust);
+    $('#cTpha').selectpicker('refresh');
+
+    var other = [
+        {code: '0', name: '1:1'},
+        {code: '1', name: '1:2'},
+        {code: '2', name: '1:4'},
+        {code: '3', name: '1:8'},
+        {code: '4', name: '1:16'},
+        {code: '5', name: '1:32'},
+        {code: '6', name: '1:61己以上'},
+        {code: '7', name: '无'},
+    ];
+    var mRpr ='';
+    for(var i=0;i<other.length;i++){
+        mRpr+='<option value="'+other[i].code+'">'+other[i].name+'</option>';
+    }
+    $('#mRpr').html(mRpr);
+    $('#mRpr').selectpicker('refresh');
+    $('#cRpr').html(mRpr);
+    $('#cRpr').selectpicker('refresh');
+
+    var testOther = [
+        {code: '0', name: '暗视野显微镜检查阳性'},
+        {code: '1', name: 'ELISA阳性'},
+        {code: '2', name: 'VDRL阳性'},
+        {code: '3', name: 'FTA-ABS阳性'},
+    ];
+    var mOther ='';
+    for(var i=0;i<testOther.length;i++){
+        mOther+='<option value="'+testOther[i].code+'">'+testOther[i].name+'</option>';
+    }
+    $('#mOther').html(mOther);
+    $('#mOther').selectpicker('refresh');
+
+    var diagnosticBasis = [
+        {code: '1', name: '临床'},
+        {code: '2', name: '流行病学'},
+        {code: '3', name: '特异性诊断'},
+    ];
+    var disDiagType ='';
+    for(var i=0;i<diagnosticBasis.length;i++){
+        disDiagType+='<option value="'+diagnosticBasis[i].code+'">'+diagnosticBasis[i].name+'</option>';
+    }
+    $('#disDiagType').html(disDiagType);
+    $('#disDiagType').selectpicker('refresh');
+
+    var pastHistory = [
+        {code: '1', name: '有'},
+        {code: '0', name: '无'}
+    ];
+    var anamnesis ='';
+    for(var i=0;i<pastHistory.length;i++){
+        anamnesis+='<option value="'+pastHistory[i].code+'">'+pastHistory[i].name+'</option>';
+    }
+    $('#anamnesis').html(anamnesis);
+    $('#anamnesis').selectpicker('refresh');
+
+    var  visitTypeArr = [
+        {code: '初诊', name: '初诊'},
+        {code: '复诊', name: '复诊'},
+        {code: '急性发作', name: '急性发作'},
+    ];
+    var visitType ='';
+    for(var i=0;i<visitTypeArr.length;i++){
+        visitType+='<option value="'+visitTypeArr[i].code+'">'+visitTypeArr[i].name+'</option>';
+    }
+    $('#visitType').html(visitType);
+    $('#visitType').selectpicker('refresh');
+
+    var gyLcfxArr = [
+        {code: '急黄肝', name: '急黄肝'},
+        {code: '隐无黄肝', name: '隐无黄肝'},
+        {code: '慢迁肝', name: '慢迁肝'},
+        {code: '慢活肝', name: '慢活肝'},
+        {code: '重肝', name: '重肝'},
+        {code: '瘀胆肝', name: '瘀胆肝'},
+        {code: '肝硬化', name: '肝硬化'},
+    ];
+    var gyLcfx ='';
+    for(var i=0;i<gyLcfxArr.length;i++){
+        gyLcfx+='<option value="'+gyLcfxArr[i].code+'">'+gyLcfxArr[i].name+'</option>';
+    }
+    $('#gyLcfx').html(gyLcfx);
+    $('#gyLcfx').selectpicker('refresh');
+
+    var gyByfxArr = [
+        {code: '甲型', name: '甲型'},
+        {code: '乙型', name: '乙型'},
+        {code: '丙型', name: '丙型'},
+        {code: '戊型', name: '戊型'},
+        {code: '未分型', name: '未分型'},
+        {code: '病原携带者', name: '病原携带者'}
+    ];
+    var gyByfx ='';
+    for(var i=0;i<gyByfxArr.length;i++){
+        gyByfx+='<option value="'+gyByfxArr[i].code+'">'+gyByfxArr[i].name+'</option>';
+    }
+    $('#gyByfx').html(gyByfx);
+    $('#gyByfx').selectpicker('refresh');
 }
 
 /**

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

@@ -4256,7 +4256,7 @@
 <!--传染病上报信息弹窗开始-->
 <div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-hidden="true" id="crbMainCardModal">
     <div class="modal-dialog modal-lg">
-        <div class="modal-content" style="width: 680px;max-height: 550px;overflow-y: auto;">
+        <div class="modal-content" style="width: 1100px;max-height: 550px;overflow-y: auto;">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" onclick="clearCrbMainCard()"><span
                         aria-hidden="true">×</span>
@@ -4264,7 +4264,10 @@
                 <h4 class="modal-title modal-title-thmz">传染病上报</h4>
             </div>
             <div class="modal-body">
-                <form class="form-horizontal form-label-left" novalidate id="crbMainCardForm" autocomplete="off">
+                <div style="float: left;width: 340px;">
+                    <table id="tb_table_crb"></table>
+                </div>
+                <div style="float: right;width: 680px; border-left: 1px solid #ddd;" >  <form class="form-horizontal form-label-left" novalidate id="crbMainCardForm" autocomplete="off">
                     <div class="item form-group">
                         <div class="col-md-12 col-sm-12 col-xs-12">
                             <button type="button" style="cursor: default;margin-bottom: 10px !important;width: 100%;text-align: left;"
@@ -4529,10 +4532,544 @@
                             </button>
                         </div>
                     </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vaccinate">分类(1)
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" required="required" title="请选择"
+                                        id="vaccinate">
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vaccinate2">分类(2)
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" required="required" title="请选择"
+                                        id="vaccinate2">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="illStartDateGroup">发病日期
+                                <span
+                                        class="required">*</span>
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <div class='input-group date input-group-own' id='illStartDateGroup'>
+                                    <input type='text' class="form-control" id="illStartDate"/>
+                                    <span class="input-group-addon">
+                            <span class="glyphicon glyphicon-calendar"></span>
+                            </span>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="illFirstDateGroup">诊断日期
+                                <span
+                                        class="required">*</span>
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <div class='input-group date input-group-own' id='illFirstDateGroup'>
+                                    <input type='text' class="form-control" id="illFirstDate"/>
+                                    <span class="input-group-addon">
+                            <span class="glyphicon glyphicon-calendar"></span>
+                            </span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="deathDateGroup">死亡日期
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <div class='input-group date input-group-own' id='deathDateGroup'>
+                                    <input type='text' class="form-control" id="deathDate"/>
+                                    <span class="input-group-addon">
+                            <span class="glyphicon glyphicon-calendar"></span>
+                            </span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group">
+                        <div class="col-md-12 col-sm-12 col-xs-12">
+                            <button type="button" style="cursor: default;margin-bottom: 10px !important;width: 100%;text-align: left;"
+                                    class="btn btn-primary">
+                                <i class="fa fa-exclamation-circle">&nbsp;&nbsp;传染病</i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="contagion">甲类
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" required="required" title="请选择"
+                                        id="contagion">
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="contagion2">乙类
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" required="required" title="请选择" data-live-search="true"
+                                        id="contagion2">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="contagion3">丙类
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" required="required" title="请选择" data-live-search="true"
+                                        id="contagion3">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group">
+                        <div class="col-md-12 col-sm-12 col-xs-12">
+                            <button type="button" style="cursor: default;margin-bottom: 10px !important;width: 100%;text-align: left;"
+                                    class="btn btn-primary">
+                                <i class="fa fa-exclamation-circle">&nbsp;&nbsp;其他法定管理以及重点临测传染病</i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="contagionQt">其他
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" required="required" title="请选择" data-live-search="true"
+                                        id="contagionQt">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group">
+                        <div class="col-md-12 col-sm-12 col-xs-12">
+                            <button type="button" style="cursor: default;width: 100%;text-align: left;margin-bottom: 0px !important;"
+                                    class="btn btn-primary">
+                                <i class="fa fa-exclamation-circle">&nbsp;&nbsp;梅毒检测结果</i>
+                            </button>
+                            <button type="button" style="cursor: default;margin-bottom: 10px !important;width: 100%;text-align: left;"
+                                    class="btn btn-success">
+                                <i class="fa fa-exclamation">&nbsp;&nbsp;成人/患儿生母填写</i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="mTrust">TRUST/RPR
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" title="请选择"
+                                        id="mTrust">
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="mRpr">滴度
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" title="请选择"
+                                        id="mRpr">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="mTppa">TPPA/TPHA
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" title="请选择"
+                                        id="mTppa">
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="mOther">其他
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" title="请选择"
+                                        id="mOther">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group">
+                        <div class="col-md-12 col-sm-12 col-xs-12">
+                            <button type="button" style="cursor: default;margin-bottom: 10px !important;width: 100%;text-align: left;"
+                                    class="btn btn-success">
+                                <i class="fa fa-exclamation">&nbsp;&nbsp;患儿填写</i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="cTrust">TRUST/RPR
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" title="请选择"
+                                        id="cTrust">
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="cRpr">滴度
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" title="请选择"
+                                        id="cRpr">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="cTppa">TPPA/TPHA
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" title="请选择"
+                                        id="cTppa">
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="cTpha">
+                                19S-IgM-TPHA
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick"  title="请选择"
+                                        id="cTpha">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="contagionText">订正病名
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="contagionText" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="disDiagType">
+                                诊断依据
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick"  title="请选择"
+                                        id="disDiagType">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="contagionText">报告单位
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12" style="padding-top: 8px;">
+                                长沙泰和医院
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="cardRet">退卡原因
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="cardRet" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="repotrDoctorName">报告医生
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12" id="repotrDoctorName" style="padding-top: 8px;">
+                                test
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="reportTel">联系电话
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="reportTel" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="crbReportDate">报告日期
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12" id="crbReportDate" style="padding-top: 8px;">
+                                test
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="inputDt">填卡日期
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12" id="inputDt" style="padding-top: 8px;">
+                                test
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="anamnesis">既往史
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" title="请选择"
+                                        id="anamnesis">
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="visitType">
+                                本次就诊
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick"  title="请选择"
+                                        id="visitType">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-12 col-sm-12 col-xs-12 item">
+                            <label class="control-label col-md-2 col-sm-2 col-xs-12" for="crbRemark"
+                                   style="margin-left: -3px;">备注</label>
+                            <div class="col-md-10 col-sm-10 col-xs-12">
+                                <input id="crbRemark" class="form-control col-md-7 col-xs-12"
+                                       data-validate-length-range="0,40"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group">
+                        <div class="col-md-12 col-sm-12 col-xs-12">
+                            <button type="button" style="cursor: default;margin-bottom: 10px !important;width: 100%;text-align: left;"
+                                    class="btn btn-primary">
+                                <i class="fa fa-exclamation-circle">&nbsp;&nbsp;病毒性肝炎专报</i>
+                            </button>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="gyLcfx">临床分型
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick" title="请选择"
+                                        id="gyLcfx">
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="gyByfx">
+                                病原分型
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <select class="form-control selectpicker show-tick"  title="请选择"
+                                        id="gyByfx">
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vAlt">ALT
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vAlt" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vZdhz">总胆红质
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vZdhz" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vKHavigm">抗-HAVIgM
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vKHavigm" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vHavRna">HAV-RNA
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vHavRna" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vHbsag">HbsAg
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vHbsag" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vKHbs">抗-HBs
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vKHbs" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vHbeag">HBeAg
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vHbeag" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vKHbe">抗-HBe
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vKHbe" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vKHbc">抗-HBc
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vKHbc" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vKHbcigm">抗-HBcIgM
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vKHbcigm" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vHbvDna">HBV-DNA
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vHbvDna" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vKHcv">抗-HCV
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vKHcv" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vHcvRna">HCV-RNA
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vHcvRna" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vKHdvigm">抗-HDVIgM
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vKHdvigm" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vKHdv">抗HDV
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vKHdv" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vHdvRna">HDV-RNA
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vHdvRna" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vKHevigm">抗-HEVIgM
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vKHevigm" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vKHev">抗HEV
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vKHev" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                    <div class="item form-group thmz_alert">
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="vHevRna">HEV-RNA
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="vHevRna" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                        <div class="col-md-6 col-sm-6 col-xs-12 item">
+                            <label class="control-label col-md-4 col-sm-4 col-xs-12" for="gyDzbm">订正病名
+                            </label>
+                            <div class="col-md-8 col-sm-8 col-xs-12">
+                                <input id="gyDzbm" class="form-control col-md-7 col-xs-12"
+                                       placeholder="请输入" type="text">
+                            </div>
+                        </div>
+                    </div>
+                </form></div>
 
-                </form>
             </div>
-            <div class="modal-footer">
+            <div class="modal-footer" style="clear: both">
                 <button type="button" class="btn btn-primary" id="saveCrbMainCard">保存</button>
                 <button type="button" class="btn btn-default" data-dismiss="modal" onclick="clearCrbMainCard()">取消
                 </button>