Merge branch 'main' of ssh://git.jizhiweb.cn:2222/clinic-v2/web

# Conflicts:
#	src/assets/config/constants.ts

src/assets/config/constants.ts

@@ -54,44 +54,108 @@ export const medTypeJson = {
     "108": "辅助生殖门诊"
 }
 export const mainAppealList = [
-    ["咳嗽", "干咳", "咳痰", "夜咳", "晨咳", "咽干", "咽痒", "咽痛", "痰中带血", "声音嘶哑", "咽部异物感", "反复感冒", "发热", "喷嚏", "流涕", "鼻塞", "头痛", "头晕", "耳鸣", "汗多", "盗汗", "自汗", "出汗", "易汗出"],
+    {
-    ["胃胀", "胃痛", "胃不适", "腹胀", "腹痛", "腹泻", "恶心", "呕吐", "反酸", "嗳气", "烧心", "纳差", "便秘", "便溏", "便血", "黑便", "大便干", "大便黏", "五更泻", "腹痛欲便", "里急后重", "排便不爽", "溏结不调"],
+        value:["咳嗽", "干咳", "咳痰", "夜咳", "晨咳", "咽干", "咽痒", "咽痛", "痰中带血", "声音嘶哑", "咽部异物感", "反复感冒", "发热", "喷嚏", "流涕", "鼻塞", "头痛", "头晕", "耳鸣", "汗多", "盗汗", "自汗", "出汗", "易汗出"],
-    ["胸闷", "胸痛", "心悸", "气短", "气喘", "气促", "眠差", "眠浅", "多梦", "易醒", "早醒", "入睡困难", "嗜睡", "尿频", "尿急", "尿痛", "尿不尽", "尿灼热", "尿分叉", "夜尿多", "尿浊", "尿血", "水肿", "阳痿", "早泄"],
+
-    ["胁痛", "颈椎痛", "关节痛", "关节僵硬", "四肢麻木", "半身麻木", "四肢无力", "偏瘫", "拘挛", "肩痛", "背痛", "腰痛", "眼干", "0千", "口苦", "牙痛", "齿衄", "口疮", "皮疹", "斑疹", "丘疹", "风团", "皮肤红斑", "皮肤瘙痒"],
+    },
-    ["闭经", "崩漏", "月经量多", "月经量少", "经期错乱", "带下量多", "带下量少", "带下异味", "黄带", "痛经", "月经提前", "月经延后"],
+    {
-    ["偶尔", "1天", "2天", "3天", "4天", "5天", "1个月", "2个月", "3个月", "半年", "1年", "1周", "2周", "3周"]
+        value:["胃胀", "胃痛", "胃不适", "腹胀", "腹痛", "腹泻", "恶心", "呕吐", "反酸", "嗳气", "烧心", "纳差", "便秘", "便溏", "便血", "黑便", "大便干", "大便黏", "五更泻", "腹痛欲便", "里急后重", "排便不爽", "溏结不调"],
-]
+    },
+    {
+        value:["胸闷", "胸痛", "心悸", "气短", "气喘", "气促", "眠差", "眠浅", "多梦", "易醒", "早醒", "入睡困难", "嗜睡", "尿频", "尿急", "尿痛", "尿不尽", "尿灼热", "尿分叉", "夜尿多", "尿浊", "尿血", "水肿", "阳痿", "早泄"],
+
+    },
+    {
+        value:["胁痛", "颈椎痛", "关节痛", "关节僵硬", "四肢麻木", "半身麻木", "四肢无力", "偏瘫", "拘挛", "肩痛", "背痛", "腰痛", "眼干", "0千", "口苦", "牙痛", "齿衄", "口疮", "皮疹", "斑疹", "丘疹", "风团", "皮肤红斑", "皮肤瘙痒"],
+
+    },
+    {
+        value: ["闭经", "崩漏", "月经量多", "月经量少", "经期错乱", "带下量多", "带下量少", "带下异味", "黄带", "痛经", "月经提前", "月经延后"],
+
+    },
+    {
+        value:["偶尔","1天", "2天", "3天", "4天", "5天", "1个月", "2个月", "3个月", "半年", "1年", "1周", "2周", "3周"]
+
+    }
+    ]
 
 export const nowMedicalHistoryList = [
-    ["恶风", "恶寒", "怕冷", "发热", "潮热", "低热", "手心热", "脚心热", "夜间发热", "寒热往来"],
+    {
-    ["自汗", "盗汗", "汗多", "汗黏", "冷汗", "头汗", "背汗", "手汗", "脚汗"],
+        header: "热寒",
-    ["眠可", "眠差", "眠浅", "多梦", "易醒", "早醒", "入睡困难", "啫睡", "情绪正常", "压力大", "眠浅", "易怒", "易躁", "焦虑", "抑郁", "心烦"],
+        value: ["恶风", "恶寒", "怕冷", "发热", "潮热", "低热", "手心热", "脚心热", "夜间发热", "寒热往来"]
-    ["纳可", "纳差", "厌食", "易饿", "饥不欲食", "口干", "口苦", "口淡", "口黏", "口干欲饮", "渴不欲饮", "喜冷饮", "喜热饮"],
+    },
-    ["小便正常", "小便黄", "小便清长", "尿频", "尿急", "尿痛", "大便正常", "便溏", "大便黏", "大便干", "完谷不化", "溏结不调"]
+    {
-]
+        header: "汗出",
+        value: ["自汗", "盗汗", "汗多", "汗黏", "冷汗", "头汗", "背汗", "手汗", "脚汗"]
+    },
+    {
+        header: "眠志",
+        value: ["眠可", "眠差", "眠浅", "多梦", "易醒", "早醒", "入睡困难", "啫睡", "情绪正常", "压力大", "眠浅", "易怒", "易躁", "焦虑", "抑郁", "心烦"]
+    },
+    {
+        header: "饮食",
+        value: ["纳可", "纳差", "厌食", "易饿", "饥不欲食", "口干", "口苦", "口淡", "口黏", "口干欲饮", "渴不欲饮", "喜冷饮", "喜热饮"]
+    },
+    {
+        header: "二便",
+        value: ["小便正常", "小便黄", "小便清长", "尿频", "尿急", "尿痛", "大便正常", "便溏", "大便黏", "大便干", "完谷不化", "溏结不调"]
+    }
+];
 
 export const beforeMedicalHistoryList = [
-    ["既往体健", "未见明显异常", "无呛咳史", "否认药物过敏史", "否认慢性病史", "否认传染病史", "否认遗传病史", "否认备孕", "否认怀孕"],
+    {
-    ["高血压", "高血脂", "心脏病", "糖尿病", "痛风", "精神疾病", "脑梗史", "肝炎", "胃炎", "肺结核", "哮喘", "鼻炎", "甲亢", "血液病"],
+        value: ["既往体健", "未见明显异常", "无呛咳史", "否认药物过敏史", "否认慢性病史", "否认传染病史", "否认遗传病史", "否认备孕", "否认怀孕"]
-    ["吸烟", "偶尔吸烟", "长期吸烟", "不饮酒", "偶尔饮酒", "长期饮酒", "未婚", "已婚", "未孕", "备孕", "怀孕", "闭经", "有早产史", "有流产史", "有痛经史"]
+    },
-]
+    {   header: "既往有",
-export const chinaAdjunctCheckList = [
+        value: ["高血压", "高血脂", "心脏病", "糖尿病", "痛风", "精神疾病", "脑梗史", "肝炎", "胃炎", "肺结核", "哮喘", "鼻炎", "甲亢", "血液病"]
+    },
+    {   header: "个人史",
+        value: ["吸烟", "偶尔吸烟", "长期吸烟", "不饮酒", "偶尔饮酒", "长期饮酒", "未婚", "已婚", "未孕", "备孕", "怀孕", "闭经", "有早产史", "有流产史", "有痛经史"]
+    }
+];
 
-    ["面色淡白", "面色姜黄", "面色晦暗", "面色少华", "面色黑", "面色青", "面色红", "目光乏神", "精神不振",],
+export const chinaAdjunctCheckList = [
-    ["舌淡红", "舌淡白", "舌色暗", "香红", "舌尖红", "舌边红", "舌青紫", "舌淡紫", "舌绛",],
+    {   header: "神色",
-    ["舌有齿痕", "舌有裂纹", "舌体胖大", "舌体瘦小", "舌有点刺", "舌尖点刺", "舌边点刺", "舌老", "舌嫩",],
+        value: ["面色淡白", "面色姜黄", "面色晦暗", "面色少华", "面色黑", "面色青", "面色红", "目光乏神", "精神不振"]
-    ["络脉短", "络脉细", "络脉粗", "络脉曲张", "络脉暗红", "络脉青紫", "络脉分叉",],
+    },
-    ["苔薄", "苔厚", "苔滑", "苔润", "苔燥", "苔腻", "苔腐", "苔剥落", "少苔", "无苔",],
+    {   header: "舌色",
-    ["苔白", "苔黑", "苔黄", "苔灰",],
+        value: ["舌淡红", "舌淡白", "舌色暗", "香红", "舌尖红", "舌边红", "舌青紫", "舌淡紫", "舌绛"]
-    ["脉浮", "脉沉", "脉弦", "脉細", "脉数", "脉滑", "脉迟", "脉涩", "脉弱", "脉虚", "脉濡", "脉缓", "脉紧",],
+    },
-    ["脉沉細", "脉沉迟", "脉沉弱", "脉細", "脈細弱", "脉弦", "脉弦細", "脉弦数", "脉数", "脉浮数"],
+    {   header: "舌形",
+        value: ["舌有齿痕", "舌有裂纹", "舌体胖大", "舌体瘦小", "舌有点刺", "舌尖点刺", "舌边点刺", "舌老", "舌嫩"]
+    },
+    {
+        header: "络脉",
+        value: ["络脉短", "络脉细", "络脉粗", "络脉曲张", "络脉暗红", "络脉青紫", "络脉分叉"]
+    },
+    {
+        header: "苔质",
+        value: ["苔薄", "苔厚", "苔滑", "苔润", "苔燥", "苔腻", "苔腐", "苔剥落", "少苔", "无苔"]
+    },
+    {
+        header: "苔色",
+        value: ["苔白", "苔黑", "苔黄", "苔灰"]
+    },
+    {
+        header: "单脉",
+        value: ["脉浮", "脉沉", "脉弦", "脉細", "脉数", "脉滑", "脉迟", "脉涩", "脉弱", "脉虚", "脉濡", "脉缓", "脉紧"]
+    },
+    {
+        header: "合脉",
+        value: ["脉沉細", "脉沉迟", "脉沉弱", "脉細", "脈細弱", "脉弦", "脉弦細", "脉弦数", "脉数", "脉浮数"]
+    }
 ];
 
 export const allergyHistoryList = [
-    ["否认药物过敏史", "否认食物过敏史"],
+    {
-    ["过敏史", "青霉素", "链霉素", "卡那霉素", "林可霉素", "左氧氟沙星", "溴芬酸钠", "阿托品", "头孢类", "磺胺类", "酒精", "碘伏", "去痛片", "扑热息痛", "安痛定",
+        value: ["否认药物过敏史", "否认食物过敏史"]
-        "安定", "鲁米那", "阿司匹林", "普鲁卡因", "毛发皮屑", "牛奶", "鸡蛋", "大豆", "小麦", "花生", "鱼虾", "坚果", "花粉", "毒菌", "尘螨"],
+    },
+    {   header:  "过敏史",
+        value: ["青霉素", "链霉素", "卡那霉素", "林可霉素", "左氧氟沙星", "溴芬酸钠", "阿托品", "头孢类", "磺胺类", "酒精", "碘伏", "去痛片", "扑热息痛", "安痛定", "安定", "鲁米那", "阿司匹林", "普鲁卡因", "毛发皮屑", "牛奶", "鸡蛋", "大豆", "小麦", "花生", "鱼虾", "坚果", "花粉", "毒菌", "尘螨"],
+        suffix: "过敏"
+    }
 ];
+
 export const physiqueExamList = [
     {
         name: "体征",
@@ -180,6 +244,5 @@ export const physiqueExamList = [
         ],
         suffix: "mmol/L"
     }
-
+    ]
-]
 

src/components/PopoverInput.vue

@@ -3,7 +3,10 @@
   <el-popover placement="bottom-start" trigger="click" :width="props.width" :virtual-ref="inputRef" ref="popoverRef">
     <div class="code-popo" v-if="props.list.length > 0">
       <div class="code-item" v-for="item in props.list">
-        <div class="code-item-name" v-for="subItem in item" @click="inputStr(subItem)">
+        <div class="code-item-header" v-if="item.header">
+          {{item.header}}
+        </div>
+        <div class="code-item-name" v-for="subItem in item.value" @click="inputStr(subItem,item)">
           {{ subItem }}
         </div>
       </div>
@@ -12,11 +15,16 @@
 </template>
 <script setup lang="ts">
 import {ref, unref} from "vue";
+interface ListItem {
+  header?: string;
+  value: string[];
+  suffix?: string;
 
+}
 const input = defineModel<string | null>();
 const props = defineProps({
   list: {
-    type: Array,
+    type: Array as () => ListItem[],
     default: []
   },
   width: {
@@ -32,8 +40,11 @@ const popoverRef = ref();
 const showPopo = () => {
   unref(popoverRef).popperRef?.delayHide?.()
 }
-const inputStr = (str: string) => {
+const inputStr = (str: string,item:ListItem) => {
   let strList = input.value ? input.value.split(",") : [];
+  if (item.suffix){
+    str = str + item.suffix;
+  }
   strList.push(str);
   input.value = strList.join(",");
 
@@ -49,7 +60,14 @@ const inputRef = ref();
     flex-wrap: wrap;
     padding: 5px 0;
     border-bottom: 1px solid #DDDDDD;
-
+    .code-item-header{
+      font-weight: bold;
+      color: #000;
+      font-size: 16px;
+      box-sizing: border-box;
+      padding: 5px;
+      text-align: center;
+    }
     .code-item-name {
       float: left;
       font-size: 16px;

src/components/outpatient/DiagnosisSearchInput.vue

@@ -5,8 +5,8 @@
   <el-popover placement="bottom-start" trigger="click" :width="props.width" ref="popoverRef" @before-enter="beforeShow" :virtual-ref="inputRef" @hide ="afterShow">
 
     <div class="container" v-if="searchList.length > 0">
-      <el-table :data="searchList" style="width: 100%" @row-click="clickRow" :show-header="props.showHeader"
+      <el-table :data="searchList" style="width: 100%"  @row-click="clickRow" :show-header="props.showHeader" size="small"
-                max-height="200px">
+                max-height="250px">
         <el-table-column v-for="item in showConfig" :prop="item.prop" :label="item.label"
                          show-overflow-tooltip></el-table-column>
       </el-table>
@@ -115,5 +115,7 @@ const init = (list: any, nList: any) => {
 defineExpose({init})
 </script>
 <style scoped lang="scss">
-
+:deep(.el-table--small .el-table__cell){
+  padding: 0;
+}
 </style>

src/components/outpatient/PharmaceuticalConsumables.vue

@@ -4,29 +4,50 @@
       <div class="list">
         <ul>
           <li class="item" v-for="(item, index) in list" :key="index">
-            <span class="index">{{ index + 1 }}</span>
+            <div class="index">{{ index + 1 }}</div>
-            <span class="name">{{ item.name }}</span>
+
-            <span class="type">{{ item.type }}</span>
+
-            <span class="unit">
+
-              <el-input-number v-model="item.selectedNum" min="1"></el-input-number>
+            <div class="name">
-                <el-dropdown>
+              <el-popover
-                <span style="line-height: 30px;margin-left: 10px">{{ item.selectedUnit }}</span>
+                  placement="top-start"
-                <template #dropdown>
+                  trigger="hover"
-                  <el-dropdown-menu v-if="item.trdnFlag == 1">
+                  width="200px"
-                    <el-dropdown-item @click="selectUnit(item,item.packagingUnit)">{{ item.packagingUnit }}
+              >
-                    </el-dropdown-item>
+                <template #reference>
-                    <el-dropdown-item @click="selectUnit(item,item.minPackagingUnit)">{{ item.minPackagingUnit }}
+                  {{ item.name }}
-                    </el-dropdown-item>
-                  </el-dropdown-menu>
                 </template>
-              </el-dropdown>
+
-            </span>
+                <div>
-            <span class="price">￥{{item.selectedPrice || '0' }}元</span>
+                  {{item.hilistCode}}
-            <span class="delete">
+                </div>
-                <el-button @click="deleteItem(item.id)">
+              </el-popover>
-                  <el-icon><CircleClose/></el-icon>
+              </div>
-                </el-button>
+            <div class="price">￥{{item.selectedPrice || '0' }}</div>
-            </span>
+            <div class="unit">
+              <div class="unit-content">
+                <el-input-number v-model="item.selectedNum" min="1" size="small"></el-input-number>
+                <el-dropdown>
+                  <span style="line-height: 30px;margin-left: 10px">{{ item.selectedUnit }}</span>
+                  <template #dropdown>
+                    <el-dropdown-menu v-if="item.trdnFlag == 1">
+                      <el-dropdown-item @click="selectUnit(item,item.packagingUnit)">{{ item.packagingUnit }}
+                      </el-dropdown-item>
+                      <el-dropdown-item @click="selectUnit(item,item.minPackagingUnit)">{{ item.minPackagingUnit }}
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </template>
+                </el-dropdown>
+              </div>
+            </div>
+            <div class="sub-price">￥{{ item.unitPrice*item.selectedNum }}</div>
+            <div class="delete">
+              <div @click="deleteItem(item.id)" class="delete-btn">
+                <el-icon>
+                  <Close />
+                </el-icon>
+              </div>
+            </div>
           </li>
         </ul>
       </div>
@@ -42,7 +63,7 @@
           </SearchInput>
         </div>
         <span style="margin-right: 24px">
-          ￥{{ sumPrice}}元
+          ￥{{ sumPrice}}
         </span>
       </div>
     </div>
@@ -51,7 +72,7 @@
 <script setup lang="ts">
 import Panel from "@/components/common/Panel.vue";
 import SearchInput from "@/components/SearchInput.vue";
-import {CircleClose} from "@element-plus/icons-vue";
+import {CircleClose, Close} from "@element-plus/icons-vue";
 import {watch, ref, computed} from "vue";
 
 const props = defineProps({
@@ -111,6 +132,7 @@ watch(()=>list.value, (newList) => {
 </script>
 
 <style scoped lang="scss">
+@use "@/assets/scss/base";
 .content {
   display: flex;
   flex-direction: column;
@@ -118,62 +140,69 @@ watch(()=>list.value, (newList) => {
   .list {
     flex: 1;
     min-height: 0;
-
     .item {
-      height: 64px;
+      height: 30px;
       border-top: 1px solid #EAEAEC;
       display: flex;
       align-items: center;
       justify-content: space-between;
+      font-size: 14px;
 
       .index {
         height: 100%;
         width: 50px;
         text-align: center;
-        line-height: 64px;
+        line-height: 30px;
-        border-right: 1px solid #EAEAEC;
       }
 
       .name {
         flex: 1;
         margin-left: 10px;
-        border-right: 1px solid #EAEAEC;
         height: 100%;
-        line-height: 64px;
+        line-height: 30px;
       }
 
-      .type {
+      .code {
         flex: 1;
         margin-left: 10px;
-        border-right: 1px solid #EAEAEC;
         height: 100%;
-        line-height: 64px;
+        line-height: 30px;
-      }
-
-      .unit {
-        flex: 1;
-        margin-left: 10px;
-        border-right: 1px solid #EAEAEC;
-        height: 100%;
-        line-height: 64px;
-        display: flex;
-        align-items: center;
-        justify-content: center;
       }
 
       .price {
         height: 100%;
-        width: 200px;
+        width: 100px;
-        line-height: 64px;
-        border-right: 1px solid #EAEAEC;
         text-align: center;
+        line-height: 30px;
+      }
+
+      .unit {
+        height: 100%;
+        width: 180px;
+        margin-left: 10px;
+        line-height: 30px;
+        .unit-content{
+          display: flex;
+          align-items: center;
+        }
+
+      }
+      .sub-price{
+        height: 100%;
+        line-height: 30px;
       }
 
       .delete {
         height: 100%;
-        width: 50px;
+        width: 100px;
-        line-height: 64px;
         text-align: center;
+        line-height: 30px;
+        .delete-btn{
+          cursor: pointer;
+          &:hover{
+            color: base.$primary-color;
+          }
+        }
       }
     }
   }

src/components/outpatient/ServiceItems.vue

@@ -4,19 +4,23 @@
       <div class="list">
         <ul>
           <li class="item" v-for="(item, index) in list" :key="index">
-            <span class="index">{{ index + 1 }}</span>
+            <div class="index">{{ index + 1 }}</div>
-            <span class="name">{{ item.itemName }}</span>
+            <div class="name">{{ item.itemName }}</div>
-            <span class="price">￥{{ item.unitPrice }}元</span>
+            <div class="price">￥{{ item.unitPrice }}</div>
-            <span class="code">{{ item.itemSocialCode }}</span>
+            <div class="unit">
-            <span class="unit">
+              <div style="display: flex; align-items: center;">
-              <el-input-number v-model="item.selectedNum" min="1"></el-input-number>
+                <el-input-number v-model="item.selectedNum" min="1" size="small"></el-input-number>
-              <span style="line-height: 30px;margin-left: 10px">{{ item.unit }}</span>
+                <span style="margin-left: 10px; line-height: 30px;">{{ item.unit }}</span>
-            </span>
+              </div>
-            <span class="delete">
+            </div>
-                <el-button @click="deleteItem(item.id)">
+            <div class="sub-price">￥{{ item.unitPrice*item.selectedNum }}</div>
-                  <el-icon><CircleClose/></el-icon>
+            <div class="delete">
-                </el-button>
+              <div @click="deleteItem(item.id)" class="delete-btn">
-              </span>
+                <el-icon>
+                  <Close />
+                </el-icon>
+              </div>
+            </div>
           </li>
         </ul>
       </div>
@@ -34,14 +38,14 @@
         </div>
         <span style="margin-right: 24px">￥{{
             list.reduce((acc, cur) => acc + cur.unitPrice * cur.selectedNum, 0)
-          }}元</span></div>
+          }}</span></div>
     </div>
   </Panel>
 </template>
 <script setup lang="ts">
 import {defineModel, computed} from "vue";
 import Panel from "@/components/common/Panel.vue";
-import {CircleClose} from '@element-plus/icons-vue'
+import {Close} from '@element-plus/icons-vue'
 import SearchInput from "@/components/SearchInput.vue";
 
 const props = defineProps({
@@ -62,12 +66,12 @@ const serviceShowConfig = [
     prop: "itemName",
   },
   {
-    label: "服务医保码",
+    label: "单价",
-    prop: "itemSocialCode",
+    prop: "unitPrice",
   },
   {
-    label: "售价",
+    label: "单位",
-    prop: "unitPrice",
+    prop: "unit",
   },
 ]
 const serviceSelect = (row: any) => {
@@ -83,6 +87,7 @@ const deleteItem = (id: any) => {
 </script>
 
 <style scoped lang="scss">
+@use "@/assets/scss/base";
 .content {
   display: flex;
   flex-direction: column;
@@ -92,57 +97,63 @@ const deleteItem = (id: any) => {
     min-height: 0;
 
     .item {
-      height: 64px;
+      height: 30px;
       border-top: 1px solid #EAEAEC;
       display: flex;
       align-items: center;
       justify-content: space-between;
+      font-size: 14px;
 
       .index {
         height: 100%;
         width: 50px;
         text-align: center;
-        border-right: 1px solid #EAEAEC;
+        line-height: 30px;
-        line-height: 64px;
       }
 
       .name {
         flex: 1;
         margin-left: 10px;
-        border-right: 1px solid #EAEAEC;
         height: 100%;
-        line-height: 64px;
+        line-height: 30px;
       }
 
       .code {
         flex: 1;
         margin-left: 10px;
-        border-right: 1px solid #EAEAEC;
         height: 100%;
-        line-height: 64px;
+        line-height: 30px;
       }
 
       .price {
         height: 100%;
-        width: 200px;
+        width: 100px;
-        line-height: 64px;
-        border-right: 1px solid #EAEAEC;
         text-align: center;
+        line-height: 30px;
       }
 
       .unit {
         height: 100%;
-        width: 200px;
+        width: 180px;
         margin-left: 10px;
-        border-right: 1px solid #EAEAEC;
+        line-height: 30px;
-        line-height: 64px;
+      }
+      .sub-price{
+        height: 100%;
+        line-height: 30px;
       }
 
       .delete {
         height: 100%;
-        width: 50px;
+        width: 100px;
-        line-height: 64px;
         text-align: center;
+        line-height: 30px;
+        .delete-btn{
+          cursor: pointer;
+          &:hover{
+            color: base.$primary-color;
+          }
+        }
       }
     }
   }