将药品每次用量改到用法后面

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

@@ -1335,20 +1335,22 @@ public class MzChargeDetailServiceImpl implements MzChargeDetailService {
                     if (mzChargeDetail.getGroupOrder() != null) {
                         name = mzChargeDetail.getGroupOrder() + "." + name;
                     }
+                    String unitDesc=null;
                     if (mzChargeDetail.getDrugUnit() != null) {
-                        String unitDesc = UnitTypeEnum.getUnitTypeByCode(mzChargeDetail.getDrugUnit()).name;
+                        unitDesc = UnitTypeEnum.getUnitTypeByCode(mzChargeDetail.getDrugUnit()).name;
                         if (mzChargeDetail.getDrugUnit().equals(ypZdDict.getWeighUnit()) && ypZdDict.getWeight() != null) {
-                            name += " " + ypZdDict.getWeight().intValue() + unitDesc;
+                            name += " " + ypZdDict.getWeight().doubleValue() + unitDesc;
                         } else if (mzChargeDetail.getDrugUnit().equals(ypZdDict.getVolUnit()) && ypZdDict.getVolum() != null) {
-                            name += " " + ypZdDict.getVolum().intValue() + unitDesc;
+                            name += " " + ypZdDict.getVolum().doubleValue() + unitDesc;
                         }
-                        name += " " + mzChargeDetail.getDrugQuan() + unitDesc;
+                       // name += " " + mzChargeDetail.getDrugQuan() + unitDesc;
                     }
                     name += " 共" + mzChargeDetail.getQuantity() + UnitTypeEnum.getUnitTypeByCode(ypZdDict.getPackUnit()).name;
                     if (StringUtils.isNotBlank(mzChargeDetail.getSupplyCode())) {
                         SupplyTypeEnum supplyTypeEnum = SupplyTypeEnum.getSupplyTypeByCode(mzChargeDetail.getSupplyCode());
                         if (supplyTypeEnum != null) {
                             name += " 用法：" + supplyTypeEnum.name;
+                            name += " " + mzChargeDetail.getDrugQuan() + unitDesc;
                         }
                     }
                     if (StringUtils.isNotBlank(mzChargeDetail.getFrequency())) {

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

@@ -250,6 +250,16 @@ $(function () {
         if (event.keyCode == 13) {  //是否是回车
             var el = event.srcElement || event.target;
             var id = el.getAttribute("id");
+            //当前西药品编码
+            var currentCode = $("#current_code").val();
+            //回车时，光标不在任何区域
+            if (id == null || id == "") {
+                //当前页面是西药保存页面，且有药品选中
+                if(currentCode!=null && currentCode!=""){
+                    $("#supplyType").next().click();
+                }
+            }
+
             if (id == null || id == "") {
                 id = el.getAttribute("data-id");
             }
@@ -2476,10 +2486,11 @@ function saveWesternMedicine(calculateTotalAmountFlag) {
     var html = '<div class="form-group">';
     html += groupId + '.<span style="margin-left: 5px"></span>';
     html += westernMedicineNamme + ' ';
-    html += drugWinDb + drugWinUnit + ' ';
-    html += drugWin + drugWinUnit + ' 共';
+    html += drugWinDb + drugWinUnit + ' 共';
+    //html += drugWin + drugWinUnit + ' 共';
     html += gross + packUnit + " " + '<br/><span style="margin-left: 15px"></span>';
     html += '用法：' + supplyTypeText + ' ';
+    html += drugWin + drugWinUnit+ ' ';
     html += '频次：' + orderFrequencyText + ' ';
     html += dayNum + '天 ';
     if (tryFlag == "true" || tryFlag == true) {
@@ -4463,6 +4474,8 @@ function checkYpInfo(code, serial, groupNo, needNotice) {
                                 $("#messageModal").modal("hide");
                                 refreshNavTabs(0, groupNo);
                                 fitWesternMedicine(res, groupNo);
+                                // //选中药品后，光标默认到用法
+                                // $("#supplyType").next().click();
                             });
                         } else {
                             refreshNavTabs(0, groupNo);
@@ -4503,6 +4516,8 @@ function checkYpInfo(code, serial, groupNo, needNotice) {
                                     $("#messageModal").modal("hide");
                                     refreshNavTabs(0, groupNo);
                                     fitWesternMedicine(res, groupNo);
+                                    // //选中药品后，光标默认到用法
+                                    // $("#supplyType").next().click();
                                 });
                             } else {
                                 refreshNavTabs(0, groupNo);
@@ -4514,11 +4529,11 @@ function checkYpInfo(code, serial, groupNo, needNotice) {
                         $("#xyTab li.active").find("a").find("small.cfdesc").text("(" + cfdesc + ")");
                         fitWesternMedicine(res, groupNo);
                     }
-                    if (needNotice) {
-                        //选中药品后，光标默认到用法
-                        $("#supplyType").next().click();
-                        //  currentEleId = 'supplyType';
-                    }
+                    // if (needNotice) {
+                    //     //选中药品后，光标默认到用法
+                    //     $("#supplyType").next().click();
+                    //     //  currentEleId = 'supplyType';
+                    // }
                 }
             } else {
                 errorMesage(res);

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

@@ -211,109 +211,105 @@
     }
 </style>
 <div class="row" style="height: calc(100% - 60px);overflow-y: auto;">
-    <div style="margin-top: 10px;width: 310px;float: left;height: calc(100% - 10px);">
+    <div style="margin-top: 10px;width: 310px;float: left;height: calc(100% - 10px);overflow-y: auto;">
         <!--<div class="title">-->
         <!--<div>就诊</div>-->
         <!--</div>-->
-        <form class="form-horizontal form-label-left mz-fixed-form" novalidate id="regi_form" autocomplete="off"
-              style="height: 100%;overflow-y: auto;">
-            <div class="item form-group">
-                <div class="col-md-6 col-sm-6 col-xs-12">
+        <div class="item form-group" >
+            <div class="col-md-6 col-sm-6 col-xs-12">
                     <span style="cursor: default;margin-bottom: 10px !important;color: #2E69EB;">
                         今日就诊
                     </span>
-                </div>
-                <div class="col-md-6 col-sm-6 col-xs-12">
-                </div>
             </div>
-            <div class="item form-group thmz_alert">
-                <div class="col-md-12 col-sm-12 col-xs-12 item">
-                    <label style="width: 40px;float: left;text-align: right;font-weight: 400;line-height: 34px;">日期：</label>
-                    <div id="reportrange" class="form-control pull-left"
-                         style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc;width: calc(100% - 40px);">
-                        <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
-                        <span>December 30, 2014 - January 28, 2015</span> <b class="caret"></b>
-                    </div>
-                </div>
+            <div class="col-md-6 col-sm-6 col-xs-12">
             </div>
-            <div class="item form-group thmz_alert">
-                <div class="col-md-12 col-sm-12 col-xs-12 item">
-
-                    <label style="width: 40px;float: left;text-align: right;font-weight: 400;line-height: 34px;">姓名：</label>
-                    <input id="userName" class="form-control col-md-7 col-xs-12"
-                           placeholder="姓名/门诊ID" type="text" data-placement="bottom-right"
-                           style="width: calc(100% - 80px);">
-                    <button type="button"
-                            style="margin-bottom: 10px !important;float: right;margin-right: -1px;width: 34px"
-                            class="btn btn-primary" onclick="refreshClinic()">
-                        <i class="fa fa-search"></i>
-                    </button>
+        </div>
+        <div class="item form-group thmz_alert" style="margin-top: 30px;">
+            <div class="col-md-12 col-sm-12 col-xs-12 item">
+                <label style="width: 40px;float: left;text-align: right;font-weight: 400;line-height: 34px;">日期：</label>
+                <div id="reportrange" class="form-control pull-left"
+                     style="background: #fff; cursor: pointer; padding: 5px 10px; border: 1px solid #ccc;width: calc(100% - 40px);">
+                    <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>
+                    <span>December 30, 2014 - January 28, 2015</span> <b class="caret"></b>
                 </div>
             </div>
-            <div class="item form-group" style="margin-top: 20px;">
-                <div class="col-md-12 col-sm-12 col-xs-12">
-                    <button type="button" class="btn btn-default" id="confirmFee"
-                            style="width: calc(100% - 20px);color: rgb(46, 105, 235);border-color: rgb(46, 105, 235);"
-                            onclick="rapidAcceptsModal()">
-                        <span>快速接诊</span>
-                    </button>
-                </div>
+        </div>
+        <div class="item form-group thmz_alert" style="margin-top: 80px;">
+            <div class="col-md-12 col-sm-12 col-xs-12 item">
+                <label style="width: 40px;float: left;text-align: right;font-weight: 400;line-height: 34px;">姓名：</label>
+                <input id="userName" class="form-control col-md-7 col-xs-12"
+                       placeholder="姓名/门诊ID" type="text" data-placement="bottom-right"
+                       style="width: calc(100% - 80px);">
+                <button type="button"
+                        style="margin-bottom: 10px !important;float: right;margin-right: -1px;width: 34px"
+                        class="btn btn-primary" onclick="refreshClinic()">
+                    <i class="fa fa-search"></i>
+                </button>
             </div>
+        </div>
+        <div class="item form-group" style="margin-top: 130px;">
             <div class="col-md-12 col-sm-12 col-xs-12">
-                <div class="x_panel_mine" style="background: #EBEBE4;">
-                    <div class="x_title">
-                        <!--<h2>候诊患者 <small>2</small></h2>-->
-                        <h2>候诊患者 (</h2>
-                        <h2 id="unClinicNum">0</h2>
-                        <h2>)</h2>
-                        <ul class="nav navbar-right panel_toolbox">
-                            <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
-                            </li>
-                        </ul>
-                        <div class="clearfix"></div>
-                    </div>
-                    <div class="x_content">
-                        <table id="tb_table_un_clinic"></table>
-                    </div>
+                <button type="button" class="btn btn-default" id="confirmFee"
+                        style="width: calc(100% - 20px);color: rgb(46, 105, 235);border-color: rgb(46, 105, 235);"
+                        onclick="rapidAcceptsModal()">
+                    <span>快速接诊</span>
+                </button>
+            </div>
+        </div>
+        <div class="col-md-12 col-sm-12 col-xs-12" style="margin-top: 30px;">
+            <div class="x_panel_mine" style="background: #EBEBE4;">
+                <div class="x_title">
+                    <!--<h2>候诊患者 <small>2</small></h2>-->
+                    <h2>候诊患者 (</h2>
+                    <h2 id="unClinicNum">0</h2>
+                    <h2>)</h2>
+                    <ul class="nav navbar-right panel_toolbox">
+                        <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
+                        </li>
+                    </ul>
+                    <div class="clearfix"></div>
+                </div>
+                <div class="x_content">
+                    <table id="tb_table_un_clinic"></table>
                 </div>
             </div>
-            <div class="col-md-12 col-sm-12 col-xs-12">
-                <div class="x_panel_mine" style="background: #EBEBE4;">
-                    <div class="x_title">
-                        <!--<h2>候诊患者 <small>2</small></h2>-->
-                        <h2>接诊中 (</h2>
-                        <h2 id="inClinicNum">0</h2>
-                        <h2>)</h2>
-                        <ul class="nav navbar-right panel_toolbox">
-                            <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
-                            </li>
-                        </ul>
-                        <div class="clearfix"></div>
-                    </div>
-                    <div class="x_content">
-                        <table id="tb_table_in_clinic"></table>
-                    </div>
+        </div>
+        <div class="col-md-12 col-sm-12 col-xs-12">
+            <div class="x_panel_mine" style="background: #EBEBE4;">
+                <div class="x_title">
+                    <!--<h2>候诊患者 <small>2</small></h2>-->
+                    <h2>接诊中 (</h2>
+                    <h2 id="inClinicNum">0</h2>
+                    <h2>)</h2>
+                    <ul class="nav navbar-right panel_toolbox">
+                        <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
+                        </li>
+                    </ul>
+                    <div class="clearfix"></div>
+                </div>
+                <div class="x_content">
+                    <table id="tb_table_in_clinic"></table>
                 </div>
             </div>
-            <div class="col-md-12 col-sm-12 col-xs-12">
-                <div class="x_panel_mine" style="background: #EBEBE4;">
-                    <div class="x_title">
-                        <!--<h2>候诊患者 <small>2</small></h2>-->
-                        <h2>已诊患者 (</h2>
-                        <h2 id="ClinicNum">0</h2>
-                        <h2>)</h2>
-                        <ul class="nav navbar-right panel_toolbox">
-                            <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
-                            </li>
-                        </ul>
-                        <div class="clearfix"></div>
-                    </div>
-                    <div class="x_content">
-                        <table id="tb_table_clinic"></table>
-                    </div>
+        </div>
+        <div class="col-md-12 col-sm-12 col-xs-12">
+            <div class="x_panel_mine" style="background: #EBEBE4;">
+                <div class="x_title">
+                    <!--<h2>候诊患者 <small>2</small></h2>-->
+                    <h2>已诊患者 (</h2>
+                    <h2 id="ClinicNum">0</h2>
+                    <h2>)</h2>
+                    <ul class="nav navbar-right panel_toolbox">
+                        <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
+                        </li>
+                    </ul>
+                    <div class="clearfix"></div>
+                </div>
+                <div class="x_content">
+                    <table id="tb_table_clinic"></table>
                 </div>
             </div>
-        </form>
+        </div>
     </div>
     <div style="margin-top: 10px;border-left: 1px solid #ddd;border-right: 1px solid #ddd;width: calc(100% - 370px);float: left;height: calc(100% - 10px);">
         <div style="height: calc(100% - 60px);overflow-y: auto;border-bottom: 1px solid #ddd;">