'颗粒剂药房修改'

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

@@ -3109,7 +3109,7 @@ function fitzyContent(zyPrescription, contentId, titleId, checkBox) {
             zypyHtml += "]";
         }
         zypyHtml += zy.quantity;
-        if(zyDetail.groupNo =='83'){
+        if(zyDetail.groupNo =='85'){
             zypyHtml += "袋";
         }else {
             zypyHtml += "g";
@@ -4593,7 +4593,7 @@ function initGenderSelect() {
  * 初始化中药类型下拉选
  */
 function initZyClassTypeSelect() {
-    // let html = '<option selected="selected" value="81">普通</option><option value="83">颗粒剂</option>';
+    // let html = '<option selected="selected" value="81">普通</option><option value="85">颗粒剂</option>';
     // $('#zyClassType').html(html);
     // $('#zyClassType').selectpicker('refresh');
     getAjaxRequst("/thmz/selectYfAllByTime",{},true,function (res) {
@@ -6971,7 +6971,7 @@ function saveChineseMedicine(calculateTotalAmountFlag) {
         return;
     }
     //颗粒 剂量只能为整数
-    if(zyClassType == '83' && !(/(^[1-9]\d*$)/.test(drugWin))){
+    if(zyClassType == '85' && !(/(^[1-9]\d*$)/.test(drugWin))){
         errorMesageSimaple("颗粒剂处方剂量只能为大于等于1的正整数！");
         return;
     }
@@ -7080,7 +7080,7 @@ function clearChineseMedicine() {
 //中药单位改变
 function zyUnitChange() {
    var zyClassTypeTemp = $("#zyClassType").val()
-   if(zyClassTypeTemp == '83'){
+   if(zyClassTypeTemp == '85'){
        $("#zyUnit").text('袋')
        //煮取 剪法 隐藏
        $("#cyZqlDiv").removeClass("in").addClass("hide");
@@ -9774,7 +9774,7 @@ function initNavTabs(index, groupNo, orderNo) {
         $('#cyJssm').selectpicker('refresh');
         $("#cyJssm").selectpicker('val', "加凉水");
         $('#cyJssm').selectpicker('refresh');
-        if($("#zyClassType").val() =='83'){
+        if($("#zyClassType").val() =='85'){
             $("#cyFjDiv").removeClass("in").addClass("hide");
         }else {
             $("#cyFjDiv").removeClass("hide").addClass("in");
@@ -10957,7 +10957,7 @@ function getParamsForpPrescription(type) {
             tempJson.cyFysm = $("#useType_1").val();
             tempJson.cyJssm = $("#cyJssm").val();
             tempJson.cyJsl = $("#cyJsl").val();
-            if(currentZyClassType !='83'){
+            if(currentZyClassType !='85'){
                 tempJson.cyZql = $("#cyZql").val();
                 tempJson.cyFj = $("#cyFj").val();
                 tempJson.cyDj = $("#zy_supplyType_1").val();
@@ -12875,7 +12875,7 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                                 if(zyPrescription[i].spec){
                                     html += "("+zyPrescription[i].spec+")";
                                 }
-                                if(zyGroupNo=='83'){
+                                if(zyGroupNo=='85'){
                                     html += zyPrescription[i].quantity + "袋";
                                 }else {
                                     html += zyPrescription[i].quantity + "g";
@@ -12928,7 +12928,7 @@ function printPrescription(patientId, times, clnicId, payMark, printType) {
                                 cyDj = "(" + cyDj + ")";
                             }
 
-                            if(zyGroupNo =='83'){
+                            if(zyGroupNo =='85'){
                                 html += "<tr><td colspan='2'>每天" + cyMtjs + "剂，" + cyJssm + cyJsl + "ml。分" + cyFfcs + "次" + cyFysm + "。</td></tr>";
                             }else {
                                 html += "<tr><td colspan='2'>每天" + cyMtjs + "剂，" + cyJssm + cyJsl + "ml，煮取量" + cyZql + "ml，复煎" + cyFj + "次。分" + cyFfcs + "次" + cyFysm + " " + cyDj + "。</td></tr>";

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

@@ -603,14 +603,13 @@
                         </div>
                         <div style="float: left;margin-left: 10px;">
                             <button type="button" class="btn btn-primary"
-<<<<<<< HEAD
                                     style="height: 30px;line-height: 15px;" id="YXButton" onclick="YX01()"><i
                                     class="fa fa-plus-square">&nbsp;&nbsp;</i>省影像平台
                             </button>
-                            <button type="button" class="btn btn-primary"
-                                    style="height: 30px;line-height: 15px;" id="jyYunButton" onclick="HR01()"><i
-                                    class="fa fa-plus-square">&nbsp;&nbsp;</i>省临床检验平台
-                            </button>
+<!--                            <button type="button" class="btn btn-primary"-->
+<!--                                    style="height: 30px;line-height: 15px;" id="jyYunButton" onclick="HR01()"><i-->
+<!--                                    class="fa fa-plus-square">&nbsp;&nbsp;</i>省临床检验平台-->
+<!--                            </button>-->
                             <button type="button" class="btn btn-primary"
                                     style="height: 30px;line-height: 15px;" id="editEmrButton" onclick="openEmr(null,null,null)"><i
                                     class="fa fa-plus-square">&nbsp;&nbsp;</i>门诊电子病历