2025 5 12

package-lock.json

@@ -43,9 +43,9 @@
       "dev": true
     },
     "@babel/runtime": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
-      "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog=="
+      "version": "7.27.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.3.tgz",
+      "integrity": "sha512-7EYtGezsdiDMyY80+65EzwiGmcJqpmcZCojSXaRgdrBaGtWTgDZKq69cPIVped6MkIM78cTQ2GOiEYjwOlG4xw=="
     },
     "@babel/template": {
       "version": "7.0.0-beta.31",
@@ -3875,9 +3875,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.5.157",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.157.tgz",
-      "integrity": "sha512-/0ybgsQd1muo8QlnuTpKwtl0oX5YMlUGbm8xyqgDU00motRkKFFbUJySAQBWcY79rVqNLWIWa87BGVGClwAB2w==",
+      "version": "1.5.159",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.159.tgz",
+      "integrity": "sha512-CEvHptWAMV5p6GJ0Lq8aheyvVbfzVrv5mmidu1D3pidoVNkB3tTBsTMVtPJ+rzRK5oV229mCLz9Zj/hNvU8GBA==",
       "dev": true
     },
     "elegant-spinner": {

src/api/patient.js

@@ -182,7 +182,7 @@ export function createCourseOfDiseaseRecord(patient_id, content, record_time, ti
 }
 
 export function modifyCourseOfDiseaseRecord(patient_id, content, record_time, id, title) {
-  console.log(title)
+  
   var params = {
     patient_id: patient_id,
     content: content,

src/api/pharmacy.js

@@ -183,12 +183,12 @@ export function changeZeroFlag(params){
   })
 }
 
-export function changeDrugCode(params){
+export function changeDrugCode(data){
 
   return request({
     url:"/api/pharmacy/changedrugcode",
-    method:"get",
-    params:params,
+    method:"post",
+    data:data,
   })
 }
 

src/xt_pages/Pharmacy/DrugDispensing.vue

@@ -674,12 +674,32 @@ export default {
     },
     saveTextArea(){
 
+      var str = this.textarea.replace(/\s+/g, '')
+       console.log("str000000000000000",str)
+
+       // 1. 分割字符串并过滤空值
+      const numbers = str.split(',').filter(item => item.trim() !== '');
+
+      // 2. 统计每个数字出现的次数
+      const countMap = numbers.reduce((acc, num) => {
+        // 由于数字很大，用字符串作为键
+        const key = num.trim();
+        acc[key] = (acc[key] || 0) + 1;
+        return acc;
+      }, {});
+
+      // 3. 转换为要求的格式数组
+      const result = Object.entries(countMap).map(([name, count]) => ({
+        name,  // 保持字符串形式，因为数字太大可能丢失精度
+        count
+      }));
 
 
        var params = {
         id:this.id,
         data_source:this.is_source,
         drug_code:this.textarea,
+        codeinfo:result
        }
        console.log("paramss",params)
 

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -269,7 +269,7 @@
             </el-table-column>
           </el-table>
         </div>
-        <!--        <div v-if="state == 2" style="margin-top: 25px">诊断时间：{{ timedate }}</div>-->
+       
       </div>
       <el-dialog title="设置" :visible.sync="dialogVisible" width="30%">
         <span style="font-size: 17px">请选择药品是否要通过药房管理出库</span>
@@ -1326,13 +1326,39 @@ export default {
 
     },
     saveTextArea(){
+
+       var str = this.textarea.replace(/\s+/g, '')
+       console.log("str000000000000000",str)
+
+       // 1. 分割字符串并过滤空值
+      const numbers = str.split(',').filter(item => item.trim() !== '');
+
+      // 2. 统计每个数字出现的次数
+      const countMap = numbers.reduce((acc, num) => {
+        // 由于数字很大，用字符串作为键
+        const key = num.trim();
+        acc[key] = (acc[key] || 0) + 1;
+        return acc;
+      }, {});
+
+      // 3. 转换为要求的格式数组
+      const result = Object.entries(countMap).map(([name, count]) => ({
+        name,  // 保持字符串形式，因为数字太大可能丢失精度
+        count
+      }));
+
+      console.log("result-----",result);
+
        var params = {
         id:this.id,
         data_source:this.is_source,
         drug_code:this.textarea,
+        codeinfo:result,
        }
        console.log("paramss",params)
 
+  
+
       changeDrugCode(params).then(response=>{
          if(response.data.state == 1){
             this.$message.success("保存成功!")
@@ -1352,21 +1378,8 @@ export default {
 
           var textarea = ""
           textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-          // var  textAreaList = this.textarea.split(",")
-          // var textarea = ""
-          // textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
-          // var  parts = textarea.split(',')
-          // for(let i=0;i<textAreaList.length;i++){
-          //   if(parts[parts.length-2] == textAreaList[i]){
-          //       this.$message.error("该条码已经存在,不能重复扫码")
-          //   }
-          // }
-
-          // const uniqueStr = [...new Set(textarea.split(','))].join(',');
-
-          // var textarea = uniqueStr
         
-
+        
           if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278|| this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10610 || this.$store.getters.xt_user.org.id == 10726){
 
             var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)

src/xt_pages/Pharmacy/drugCode.vue

@@ -476,10 +476,32 @@ export default {
       this.dialogVisibleOne = true
     },
     saveTextArea() {
+      var str = this.textarea.replace(/\s+/g, '')
+       console.log("str000000000000000",str)
+
+       // 1. 分割字符串并过滤空值
+      const numbers = str.split(',').filter(item => item.trim() !== '');
+
+      // 2. 统计每个数字出现的次数
+      const countMap = numbers.reduce((acc, num) => {
+        // 由于数字很大，用字符串作为键
+        const key = num.trim();
+        acc[key] = (acc[key] || 0) + 1;
+        return acc;
+      }, {});
+
+      // 3. 转换为要求的格式数组
+      const result = Object.entries(countMap).map(([name, count]) => ({
+        name,  // 保持字符串形式，因为数字太大可能丢失精度
+        count
+      }));
+
+      console.log("result-----",result);
       var params = {
         id: this.id,
         data_source: 1,
         drug_code: this.textarea,
+        codeinfo:result
       }
       console.log("paramss", params)
       if(this.is_type == 1){
@@ -500,6 +522,7 @@ export default {
           id: this.id,
           data_source: 2,
           drug_code: this.textarea,
+          codeinfo:result
          }
         changeDrugCode(params).then(response=>{
           this.$message.success("保存成功!")
@@ -517,6 +540,7 @@ export default {
           id: this.id,
           data_source: 3,
           drug_code: this.textarea,
+          codeinfo:result
         }
         changeDrugCode(params).then(response=>{
           this.$message.success("保存成功!")

src/xt_pages/drugSourceCode/drugChange.vue

@@ -270,10 +270,32 @@ export default {
             this.dialogVisibleOne = true
       },
       saveTextArea(){
+        var str = this.textarea.replace(/\s+/g, '')
+       console.log("str000000000000000",str)
+
+       // 1. 分割字符串并过滤空值
+      const numbers = str.split(',').filter(item => item.trim() !== '');
+
+      // 2. 统计每个数字出现的次数
+      const countMap = numbers.reduce((acc, num) => {
+        // 由于数字很大，用字符串作为键
+        const key = num.trim();
+        acc[key] = (acc[key] || 0) + 1;
+        return acc;
+      }, {});
+
+      // 3. 转换为要求的格式数组
+      const result = Object.entries(countMap).map(([name, count]) => ({
+        name,  // 保持字符串形式，因为数字太大可能丢失精度
+        count
+      }));
+
+      console.log("result-----",result);
        var params = {
         id:this.id,
         data_source:1,
         drug_code:this.textarea,
+        codeinfo:result
        }
        console.log("paramss",params)
       changeDrugCode(params).then(response=>{

src/xt_pages/drugSourceCode/drugCodeQuery.vue

@@ -265,10 +265,32 @@
             this.dialogVisibleOne = true
       },
       saveTextArea(){
+      var str = this.textarea.replace(/\s+/g, '')
+       console.log("str000000000000000",str)
+
+       // 1. 分割字符串并过滤空值
+      const numbers = str.split(',').filter(item => item.trim() !== '');
+
+      // 2. 统计每个数字出现的次数
+      const countMap = numbers.reduce((acc, num) => {
+        // 由于数字很大，用字符串作为键
+        const key = num.trim();
+        acc[key] = (acc[key] || 0) + 1;
+        return acc;
+      }, {});
+
+      // 3. 转换为要求的格式数组
+      const result = Object.entries(countMap).map(([name, count]) => ({
+        name,  // 保持字符串形式，因为数字太大可能丢失精度
+        count
+      }));
+
+      console.log("result-----",result);
        var params = {
         id:this.id,
         data_source:1,
         drug_code:this.textarea,
+        codeinfo:result
        }
        console.log("paramss",params)
       changeDrugCode(params).then(response=>{

src/xt_pages/stock/stockInOrderAdd.vue

@@ -350,6 +350,8 @@
          inputmode="verbatim"
          @keyup.native="changeText"
          @paste.native.prevent="handlePaste"
+         @compositionstart="handleCompositionStart"
+          @compositionend="handleCompositionEnd"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
@@ -548,23 +550,24 @@
         showDuplicateAlert:false,
         showDuplicateAlertOne:false,
         good_id:0,
-        isComposing: false
+        isComposing: false,
+        msg:"",
+        isChineseIME: false
       }
     },
     methods: {
     
-      handleKeyDown(e) {
-     
+      handleCompositionStart() {
+        this.isChineseIME = true
       },
-  
-      handlePaste(e) {
-        e.preventDefault(); // 完全禁止粘贴，避免绕过输入限制
-        this.$message.warning('扫码输入不支持粘贴');
+      handleCompositionEnd() {
+        this.isChineseIME = false
       },
+  
+     
       getTotal(){
         if(this.textarea!=null){
           var  textAreaList = this.textarea.split(",")
-          console.log("textArrleti",textAreaList)
           var arr = []
           if(textAreaList!=null && textAreaList.length>0){
             for(let i=0;i<textAreaList.length;i++){
@@ -1174,6 +1177,32 @@
      },
      changeText(event){
 
+     
+
+      // if (this.isChineseIME == false) {
+      //    console.log("因为======英文",)
+      // }
+
+      // if (this.isChineseIME == true) {
+      //    console.log("因为======中文")
+      // }
+
+
+      // var str = this.toHalfWidth(this.textarea)
+
+      // console.log("str===============",this.convertToHalfWidth(str))
+ 
+
+      // var newArr = []
+
+      // newArr.push(this.convertToHalfWidth(str).replace(/\s+/g, ""))
+
+      // console.log("newArr------",newArr)
+
+      // var normalizedSpace = this.fullWidthToHalfWidth(this.textarea);
+      // console.log("halfWidthStr",normalizedSpace);
+
+      // this.textarea = normalizedSpace
       //  1. 转换为半角字符（英文输入法标准）
         const halfWidth = this.textarea.replace(/[\uff01-\uff5e]/g, ch => 
           String.fromCharCode(ch.charCodeAt(0) - 0xfee0)
@@ -1182,40 +1211,12 @@
         // 2. 移除中文空格（全角空格转半角）
       const normalizedSpace = halfWidth.replace(/\u3000/g, ' ');
 
-
-      //   const fullToHalfMap = {
-      //     '（': '(', '）': ')',
-      //     '０': '0', '１': '1', '２': '2', '３': '3', '４': '4',
-      //     '５': '5', '６': '6', '７': '7', '８': '8', '９': '9',
-      //     'Ａ': 'A', 'Ｂ': 'B', 'Ｃ': 'C', 'Ｄ': 'D', 'Ｅ': 'E',
-      //     'Ｆ': 'F', 'Ｇ': 'G', 'Ｈ': 'H', 'Ｉ': 'I', 'Ｊ': 'J',
-      //     'Ｋ': 'K', 'Ｌ': 'L', 'Ｍ': 'M', 'Ｎ': 'N', 'Ｏ': 'O',
-      //     'Ｐ': 'P', 'Ｑ': 'Q', 'Ｒ': 'R', 'Ｓ': 'S', 'Ｔ': 'T',
-      //     'Ｕ': 'U', 'Ｖ': 'V', 'Ｗ': 'W', 'Ｘ': 'X', 'Ｙ': 'Y',
-      //     'Ｚ': 'Z', 'ａ': 'a', 'ｂ': 'b', 'ｃ': 'c', 'ｄ': 'd',
-      //     'ｅ': 'e', 'ｆ': 'f', 'ｇ': 'g', 'ｈ': 'h', 'ｉ': 'i',
-      //     'ｊ': 'j', 'ｋ': 'k', 'ｌ': 'l', 'ｍ': 'm', 'ｎ': 'n',
-      //     'ｏ': 'o', 'ｐ': 'p', 'ｑ': 'q', 'ｒ': 'r', 'ｓ': 's',
-      //     'ｔ': 't', 'ｕ': 'u', 'ｖ': 'v', 'ｗ': 'w', 'ｘ': 'x',
-      //     'ｙ': 'y', 'ｚ': 'z'
-      // };
-
-      // // 2. 执行转换
-      // let result = '';
-      // for (const char of this.textarea) {
-      //     result += fullToHalfMap[char] || char;
-      // }
-
-      // // 3. 提取标准格式数据
-      // const normalizedSpace = result.match(/(\(\d{2}\)[\dA-Za-z]+)+/g);
-      
-      // console.log("normalizedSpace---",normalizedSpace[0])
-
-
       var  textAreaList = normalizedSpace.split(",")
+
+      console.log("textarealist====",textAreaList)
       if (event.key === 'Enter') {
         var textarea = ""
-         textarea += normalizedSpace.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+        textarea += normalizedSpace + ","
          var  parts = textarea.split(',')
          for(let i=0;i<textAreaList.length;i++){
            if(parts[parts.length-2] == textAreaList[i]){
@@ -1250,11 +1251,11 @@
           return
         }
 
-        // if(this.org_id == 10164 || this.org_id == 0){
+        if(this.org_id == 10164 || this.org_id == 0){
           
-        //   this.getRepatGood(this.textarea)
-        //   this.showDuplicateAlertOne = true
-        // }
+          this.getRepatGood(this.textarea)
+          this.showDuplicateAlertOne = true
+        }
       
         this.dialogVisible = false
       },
@@ -1307,13 +1308,44 @@
            var msg = response.data.data.msg
          }else{
             var msg = response.data.msg
+            console.log("msg-------------------",msg)
             this.msg = msg
             this.$message.error(msg)
          }
        })
+     },
+     
+   toHalfWidth(str) {
+      return str.replace(/[０-９]/g, function(c) { // 转换数字
+        return String.fromCharCode(c.charCodeAt(0) - 0xfee0);
+      }).replace(/[Ａ-ｚＡ-Ｚ]/g, function(c) { // 转换英文字母
+        return String.fromCharCode(c.charCodeAt(0) - 0xfee0);
+      });
+    },
+   convertToHalfWidth(str) {
+         // 1. 替换所有全角括号为半角
+          str = str.replace(/[（）]/g, c => c === '（' ? '(' : ')');
+          
+          // 2. 处理特殊格式转换
+          str = str
+            // 处理 (01) 开头的特殊情况
+            .replace(/^\(11\)/, '(01)')
+            .replace(/^\(01\)/, '(01)')
+            // 处理 ()1) 转换为 (11)
+            .replace(/\(\)1\)/g, '(11)')
+            // 处理 ()7) 转换为 (17)
+            .replace(/\(\)7\)/g, '(17)')
+            // 处理 ()X) 的一般情况
+            .replace(/\(\)(\d)\)/g, '(1$1)');
+          
+          // 3. 移除末尾多余的括号和数字
+          str = str.replace(/[)\d]+$/, '');
+          
+          return str;
      }
-    }
-    ,
+
+    },
+    
     created() {
       this.org_id = this.$store.getters.xt_user.org.id
       var nowDate = new Date()

src/xt_pages/user/courseOfDisease_new.vue

@@ -64,7 +64,7 @@
               <div style="flex: 1;">
                 记录时间:
                 <el-date-picker v-model="record_date" prefix-icon="el-icon-date" :editable="false"
-                              style="width: 250px;"
+                              style="width: 200px;"
                               format="yyyy-MM-dd HH:mm:ss"
                                value-format="yyyy-MM-dd HH:mm:ss"
                               type="datetime" placeholder="选择日期时间" align="right" 
@@ -81,6 +81,10 @@
                   </el-option>
                 </el-select>
               </div>
+              <div style="flex: 1;">
+                病程标题:
+                <el-input style="width: 150px;" v-model="title"></el-input>
+              </div>
             </div>
             <div>
               <span style="display: inline-block;border-left: 5px solid #3891f1f5;padding-left: 5px;margin-bottom: 5px;">
@@ -1378,13 +1382,14 @@
         }else{
           this.record_date  = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
         }
-        console.log("record_date----------------",this.record_date)
+        // console.log("record_date----------------",this.record_date)
         this.admin_user_id = val.recorder
         if(this.admin_user_id == 0){
            this.admin_user_id = ""
         }
         this.id = val.id
         this.ids = val.id
+        this.title = val.title
       },
       getCurrentChangeTwo(val){
 
@@ -1508,6 +1513,7 @@
           record_date:this.record_date,
           content:this.new_content,
           admin_user_id:this.admin_user_id,
+          title:this.title
         }
        
         console.log("params",params)