djseo

src/components/patientRegister/PatientRegisterEdit.vue

@@ -615,6 +615,7 @@ export default {
         isMaxMedicalTimes: 'N',
         medicalStartDate: null,
         hisPatientId: '',  //对接 hisid
+        registerCheckAsbitems: [], //所选组合项目明细
       }, //单位 记录 目前新增与更新是一致
       formInit: {}, //表单初始化
       customerOrgRegisterList: [], //单位体检次数列表
@@ -848,21 +849,32 @@ export default {
         this.form.medicalCenterId = this.peisid; //体检中收
         this.form.customerOrgId = this.preCustomerOrgId || this.dict.personOrgId //体检单位
         this.form.customerOrgParentId = await this.getParentCustomerOrgId(this.form.customerOrgId) //体检父单位
-        this.dataTransOpts.refresh.register_check_asbitem.D++ //触发所选组合项目刷新  
+        this.handleFormData()
       } else {
         // let res = await getapi(`/api/app/patient-register/${patientRegisterId}`)
-        let res = await postapi('/api/app/patientregister/getinfoorpatient', { patientRegisterId })
-        // this.form = res.data  这种方式，会造成 checkbox 值变化不响应，故取消
-        objCopy(res.data, this.form)
+        postapi('/api/app/patientregister/getinfoorpatient', { patientRegisterId }).then(res => {
+          if (res.code > -1) {
+            // this.form = res.data  这种方式，会造成 checkbox 值变化不响应，故取消
+            objCopy(res.data, this.form)
+            this.handleFormData()
+          }
+        })
       }
+    },
+
+    handleFormData() {
       this.initBox();
       this.getPeoplePhoto(this.form.photo)
-
-      // this.dataTransOpts.refresh.register_check_asbitem.D++ //触发所选组合项目刷新  
+      
+      // this.dataTransOpts.refresh.register_check_asbitem.D++ //触发所选组合项目刷新 (取消这种触发，减少交互)
+      this.dataTransOpts.tableM.register_check_asbitem = this.form.registerCheckAsbitems
+      this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
+        e.standTotal = e.amount * e.standardPrice
+        e.total = e.amount * e.chargePrice
+      });
 
       // 单位/个人 的分组与套餐处理
       this.changeCustomerOrgId(this.form.customerOrgId)
-
     },
 
 
@@ -892,13 +904,14 @@ export default {
         customerOrgId = v
       }
       this.preCustomerOrgId = customerOrgId
-      let customerOrgParentId = await this.getParentCustomerOrgId(customerOrgId)
+      // let customerOrgParentId = await this.getParentCustomerOrgId(customerOrgId)
+      let customerOrgParentId = this.form.customerOrgParentId
 
       if (customerOrgParentId) {
         if (customerOrgParentId == this.dict.personOrgId) {
           this.form.customerOrgRegisterId = "00000000-0000-0000-0000-000000000001"
         } else {
-          // 获取体检次数
+          // 获取体检次数字典库
           this.getCustomerOrgRegisterList(customerOrgParentId)
         }
 
@@ -960,7 +973,8 @@ export default {
               }
             }
             // /api/app/customerorggroup/getlistinfilter?CustomerOrgRegisterId=${this.form.customerOrgRegisterId}
-            if (this.form.customerOrgRegisterId) return postapi('/api/app/CustomerOrgGroup/GetListForPatentRegisterByFilter', { customerOrgRegisterId: this.form.customerOrgRegisterId }) //获取单位分组
+            this.patientRegister.customerOrgGroup = []
+            if (this.form.customerOrgRegisterId && this.form.customerOrgRegisterId != '00000000-0000-0000-0000-000000000001') return postapi('/api/app/CustomerOrgGroup/GetListForPatentRegisterByFilter', { customerOrgRegisterId: this.form.customerOrgRegisterId }) //获取单位分组
           }
         }).then(res => {
           if (res && res.code != -1) {

src/components/patientRegister/PatientRegisterItem.vue

@@ -320,7 +320,11 @@ export default {
       } else {
         getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${id}`).then(res => {
           if (res.code > -1) {
-            this.dataTransOpts.tableM.register_check_asbitem = deepCopy(res.data)
+            res.data.forEach(e => {
+              e.standTotal = e.amount * e.standardPrice
+              e.total = e.amount * e.chargePrice
+            });
+            this.dataTransOpts.tableM.register_check_asbitem = res.data
             this.refreshAsbitem()
           }
         })
@@ -332,9 +336,11 @@ export default {
     copyNew() {
       if (this.oldFormId) {
         getapi(`/api/app/registerasbitem/getlistinpatientregisterid?PatientRegisterId=${this.oldFormId}`).then(res => {
-          if (res.code > -1) {
-            this.dataTransOpts.tableM.register_check_asbitem = deepCopy(res.data)
+          if (res.code > -1) {            
+            this.dataTransOpts.tableM.register_check_asbitem = res.data
             this.dataTransOpts.tableM.register_check_asbitem.forEach(e => {
+              e.standTotal = e.amount * e.standardPrice
+              e.total = e.amount * e.chargePrice
               e.id = '';
               e.patientRegisterId = '';
               e.isCharge = 'N';

src/components/patientRegister/PatientRegisterList.vue

@@ -718,9 +718,9 @@ export default {
       if (!id) return
       this.dataTransOpts.tableS.patient_register.id = id
 
-      let res = await postapi('/api/app/patientregister/getinfoorpatient', { patientRegisterId: this.dataTransOpts.tableS.patient_register.id })
+      let res = await postapi('/api/app/patientregister/getlistinfilter', { patientRegisterNo: this.dataTransOpts.tableS.patient_register.patientRegisterNo })
       if (res.code != 1) return
-      let currentRow = res.data
+      let currentRow = res.data[0]
 
       // this.tableData.forEach(e => {
       //   e.choosed = false

src/components/sumDoctorCheck/SumPREdit.vue

@@ -4,24 +4,27 @@
       <div>
         <span class="query">体检结论</span>
         <el-select v-model="dataTransOpts.tableS.patient_register.medicalConclusionId" filterable clearable
-          :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3' ? true : false" placeholder="请选择" style="width: 80px"
-          size="small">
-          <el-option v-for="item in medicalConclusionFilter" :key="item.id" :label="item.displayName" :value="item.id" />
+          :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3' ? true : false" placeholder="请选择"
+          style="width: 80px" size="small">
+          <el-option-group v-for="group in medicalConclusionGroup" :key="group.value" :label="group.label">
+            <el-option v-for="item in group.options" :key="item.id" :label="item.displayName"
+              :value="item.id" />
+          </el-option-group>
         </el-select>
       </div>
       <div>
         <span class="query">总检医生</span>
         <el-select v-model="dataTransOpts.tableS.patient_register.summaryDoctorId" filterable clearable
-          :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3' ? true : false" placeholder="请选择" style="width: 80px"
-          size="small">
+          :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3' ? true : false" placeholder="请选择"
+          style="width: 80px" size="small">
           <el-option v-for="item in users" :key="item.id" :label="item.surname" :value="item.id" />
         </el-select>
       </div>
       <div>
         <span class="query">总检日期</span>
         <el-date-picker v-model="dataTransOpts.tableS.patient_register.summaryDate" value-format="yyyy-MM-dd HH:mm:ss"
-          :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3' ? true : false" type="date" style="width: 90px"
-          size="small" />
+          :disabled="dataTransOpts.tableS.patient_register.completeFlag == '3' ? true : false" type="date"
+          style="width: 90px" size="small" />
       </div>
       <div style="margin-top: 3px;">
         <span class="query">总检</span>
@@ -29,15 +32,15 @@
       </div>
       <div>
         <span class="query">审核医生</span>
-        <el-select v-model="dataTransOpts.tableS.patient_register.auditDoctor" disabled placeholder="请选择" style="width: 80px"
-          size="small">
+        <el-select v-model="dataTransOpts.tableS.patient_register.auditDoctor" disabled placeholder="请选择"
+          style="width: 80px" size="small">
           <el-option v-for="item in users" :key="item.id" :label="item.userName" :value="item.id" />
         </el-select>
       </div>
       <div>
         <span class="query">审核日期</span>
-        <el-date-picker v-model="dataTransOpts.tableS.patient_register.auditDate" value-format="yyyy-MM-dd" disabled type="date"
-          style="width: 90px" size="small" />
+        <el-date-picker v-model="dataTransOpts.tableS.patient_register.auditDate" value-format="yyyy-MM-dd" disabled
+          type="date" style="width: 90px" size="small" />
       </div>
       <div style="margin-top: 3px;">
         <span class="query">审核</span>
@@ -50,13 +53,15 @@
 
 import { mapState } from "vuex";
 import { getapi, postapi, putapi, deletapi } from "@/api/api";
+import { arrayExistObj } from "../../utlis/proFunc"
 
 export default {
   components: {},
   data() {
     return {
       users: [],
-      medicalConclusion:[],
+      medicalConclusion: [],
+      medicalConclusionGroup: [],
     };
   },
 
@@ -69,16 +74,7 @@ export default {
 
   computed: {
     ...mapState(["dict", "dataTransOpts"]),
-
-    medicalConclusionFilter(){
-      return this.medicalConclusion.filter(e => {
-        if(this.dataTransOpts.tableS.patient_register.medicalTypeId){
-          return e.medicalConclusionTypeId == this.dataTransOpts.tableS.patient_register.medicalTypeId
-        }else{
-          return e
-        }
-      })
-    }
+    
   },
   methods: {
     // 初始化字典数据
@@ -90,25 +86,58 @@ export default {
             this.users = res.data.items
           }
         })
-      
+
       // 获取体检结论信息
       getapi('/api/app/medical-conclusion/in-type')
         .then(res => {
           if (res.code != -1) {
             this.medicalConclusion = res.data
+            this.medicalConclusionHandle()
           }
         })
-      
+
     },
 
+    medicalConclusionHandle() {
+      //   <el-option-group
+      //   v-for="group in options"
+      //   :key="group.label"
+      //   :label="group.label">
+      //   <el-option
+      //     v-for="item in group.options"
+      //     :key="item.value"
+      //     :label="item.label"
+      //     :value="item.value">
+      //   </el-option>
+      // </el-option-group>
+      this.medicalConclusionGroup = []
+      this.medicalConclusion.forEach(e => {
+        let lfind = arrayExistObj(this.medicalConclusionGroup, 'value', e.medicalConclusionTypeId)
+        if (lfind > -1) {
+          this.medicalConclusionGroup[lfind]["options"].push({ id: e.id, displayName: e.displayName })
+        } else {
+          this.medicalConclusionGroup.push({            
+            label: e.medicalConclusionTypeName,
+            value: e.medicalConclusionTypeId,
+            options: [{ id: e.id, displayName: e.displayName }]
+          })
+        }
+      });
+    },
   },
   //监听事件
   watch: {
-    
+
   },
 };
 </script>
 <style scoped>
+::v-deep .el-select-group__title{
+  font-size: 15px;
+  background-color: #EEEEEE;
+  color: black;
+  font-weight: 700;
+}
 .query {
   font-size: 14px;
   margin-left: 10px;