doctor

2 years ago · 595b03b7c8
17 changed files with 90 additions and 38 deletions
--- a/src/components/doctorCheck/CheckItemList.vue
+++ b/src/components/doctorCheck/CheckItemList.vue
@ -34,16 +34,14 @@
          <div style="overflow-y:auto; height:300px;width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;">
            <div v-for="item in moreResult.data" :key="item.id" style="margin: 5px;cursor:pointer;"
              @click="clickResult(item)" @dblclick="dblclickResult(item)">
-              <el-tag size="samll">
-                <i class="el-icon-star-off" style="padding-right: 10px;"></i>{{ item.result }}
-              </el-tag>
+              <el-tag size="samll" style="color: #303133;">{{ item.result }}</el-tag>
            </div>
          </div>
          <div>特殊符号：</div>
          <div style="overflow-y:auto; width:100%;display: flex;flex-wrap: wrap;align-content: flex-start;">
            <div v-for="item in symbols" :key="item.id" style="margin: 1px; 2px;cursor:pointer;"
              @click="insertSymbols(item.displayName)">
-              <el-tag style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 15px;">
+              <el-tag style="padding: 0 3px;height: 24px;line-height: 24px;font-size: 15px;color: #303133;">
                {{ item.displayName }}
              </el-tag>
            </div>
--- a/src/components/doctorCheck/CheckPictureUpload.vue
+++ b/src/components/doctorCheck/CheckPictureUpload.vue
@ -92,7 +92,7 @@ export default {
    btnUpload() {
      console.log('that.registerCheckId', this.registerCheckId)
      if (!(this.fileList && typeof this.fileList == 'object' && this.fileList.length > 0)) {
-        this.$message.warning({ showClose: true, message: "请选择要上传的文件！"})
+        this.$message.warning({ showClose: true, message: "请选择要上传的文件！" })
        return
      }
      let checkSize = []
@ -101,7 +101,7 @@ export default {
      });

      if (checkSize.length > 0) {
-        this.$message.error({ showClose: true, message: `所选文件 ${JSON.stringify(checkSize)} 大于 20MB ，文件过大无法上传`})
+        this.$message.error({ showClose: true, message: `所选文件 ${JSON.stringify(checkSize)} 大于 20MB ，文件过大无法上传` })
        return;
      }

@ -111,15 +111,22 @@ export default {
      for (let i = 0; i < this.fileList.length; i++) {
        if (err) break;
        let file = this.fileList[i]
+        console.log('file',file)
        let reader = new FileReader();
        let that = this;
        // 定义读取文件
        reader.onload = (event) => {
+          let fileName = ""
+          let dotIndex = file.name.lastIndexOf('.');
+          if(dotIndex>-1) fileName = file.name.substring(0, dotIndex);
          let data = event.target.result;
          console.log('base64', data.length, data)
          let body = {
            registerCheckId: that.registerCheckId,
-            pictureBaseStrs: [data]
+            pictureBaseStrs: [{
+              fileName,
+              pictureBaseStr: data
+            }]
          }
          postapi('/api/app/registercheckpicture/uploadregistercheckpicturemany', body)
            .then(res => {
--- a/src/components/doctorCheck/PatientRegisterList.vue
+++ b/src/components/doctorCheck/PatientRegisterList.vue
@ -172,7 +172,7 @@

    <!--通用选单位、体检次数、分组的控件-->
    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" :append-to-body="true"
-      width="800px" height="600px">
+      width="880px" height="600px">
      <CusOrgOCX :useCustomerOrg="false" :initDateType="'medicalStartDate'" />
    </el-dialog>

--- a/src/components/doctorCheck/RegisterCheckList.vue
+++ b/src/components/doctorCheck/RegisterCheckList.vue
@ -102,7 +102,7 @@ export default {
        return
      }
      console.log(`/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`)
-      getapi(`/api/app/register-check/register-check-or-asbitem/${patientRegisterId}`)
+      postapi('/api/app/RegisterCheck/GetRegisterCheckWithAsbitems', { patientRegisterId })
        .then((res) => {
          console.log("registerCheckList", res.data);
          if (res.code != -1) {
--- a/src/components/patientRegister/AsbChargeRequest.vue
+++ b/src/components/patientRegister/AsbChargeRequest.vue
@ -16,15 +16,15 @@
          </el-table>
        </el-tab-pane>
        <el-tab-pane label="已收费项目" name="2">
-          <el-table :data="hisRequestData" border style="width: 100%" row-key="id"
-            height="160" highlight-current-row size="small" @row-click="rowClick" :row-style="{ height: '25px' }">
+          <el-table :data="hisRequestData" border style="width: 100%" row-key="id" height="160" highlight-current-row
+            size="small" @row-click="rowClick" :row-style="{ height: '25px' }">
            <el-table-column type="index" label="序号" align="center" width="40" />
            <el-table-column label="申请单号" min-width="100" prop="chargeRequestNo"></el-table-column>
            <el-table-column prop="hisChargeNo" label="his收费单" min-width="80" align="center" />
            <el-table-column prop="charges" label="金额" min-width="80" align="center" />
            <el-table-column prop="chargeRequestFlag" label="收费状态" width="70" align="center">
              <template slot-scope="scope">
-                <div>{{ scope.row.chargeRequestFlag }}</div>
+                <div>{{ setChargeRequestFlag(scope.row.chargeRequestFlag) }}</div>
              </template>
            </el-table-column>
            <el-table-column prop="ch" label="收费人员" min-width="80" align="center" />
@ -33,18 +33,20 @@
              <template slot-scope="scope">
                <div style="display: flex;justify-content: space-between;">
                  <div>
-                    <el-button class="commonbutton" @click="cancelRequest(scope.row)" style="width:80px;" :disabled="setBtnDisabled(scope.row,'cancel')">撤消申请</el-button>
+                    <el-button class="commonbutton" @click="cancelRequest(scope.row)" style="width:80px;"
+                      :disabled="setBtnDisabled(scope.row, 'cancel')">撤消申请</el-button>
                  </div>
                  <div>
-                    <el-button class="commonbutton" @click="chargeBack(scope.row)" style="width:50px;" :disabled="setBtnDisabled(scope.row,'chargeBack')">退费申请</el-button>
+                    <el-button class="commonbutton" @click="chargeBack(scope.row)" style="width:50px;"
+                      :disabled="setBtnDisabled(scope.row, 'chargeBack')">退费申请</el-button>
                  </div>
                </div>
              </template>
            </el-table-column>
          </el-table>
          <div style="padding: 10px 0 5px 0;">申请单包含项目</div>
-          <el-table :data="hisRequestDataDetails" border style="width: 100%" row-key="id"
-            height="256" highlight-current-row size="small" :row-style="{ height: '25px' }">
+          <el-table :data="hisRequestDataDetails" border style="width: 100%" row-key="id" height="256"
+            highlight-current-row size="small" :row-style="{ height: '25px' }">
            <el-table-column type="index" label="序号" align="center" width="40" />
            <el-table-column label="组合项目" min-width="150" prop="asbitemName"></el-table-column>
            <el-table-column label="数量" prop="amount" min-width="50" align="center"></el-table-column>
@ -125,28 +127,46 @@ export default {
        })
    },

+    setChargeRequestFlag(chargeRequestFlag) {
+      let ret = '未收费'
+      switch (chargeRequestFlag) {
+        case '1':
+          ret = '已收费'
+          break;
+        case '2':
+          ret = '已作废'
+          break;
+        case '3':
+          ret = '已撤消'
+          break;
+        default:
+          break;
+      }
+      return ret
+    },
+
    handleSelectionChange(v) {
      this.selectedData = v;
    },

-    setBtnDisabled(row,oprType){
+    setBtnDisabled(row, oprType) {
      let ret = true
-      if(oprType == 'chargeBack'){
-
-      }else{
-
+      if (oprType == 'chargeBack') {
+        if(row.chargeRequestFlag == '1') ret = false
+      } else {
+        if(row.chargeRequestFlag == '0') ret = false
      }
-
+      return ret
    },

    // 获取申请单明细
-    rowClick(row){
+    rowClick(row) {
      this.hisRequestDataDetails = []
      postapi('/api/app/ChargeRequest/GetChargeRequestAsbitemsByChargeQuestId', { chargeRequestId: row.id })
        .then(res => {
          if (res.code > -1) {
            res.data.forEach(e => {
-              e.total = Number(e.chargePrice*e.amount)
+              e.total = Number(e.chargePrice * e.amount)
              this.hisRequestDataDetails.push(e)
            });
          }
--- a/src/components/patientRegister/PatientRegisterItem.vue
+++ b/src/components/patientRegister/PatientRegisterItem.vue
@ -1133,7 +1133,7 @@ export default {
    // 通过组合项目，获取包含明细
    getAsbItems(asbId) {
      let asbItems = this.asbItems.filter(e => { return e.asbitemId == asbId })
-      console.log(asbId,asbItems)
+      // console.log(asbId,asbItems)
      let ret = []
      asbItems.forEach(e => {
        ret.push(' ' + e.itemName)
--- a/src/components/patientRegister/patientRegisterAsbItem.vue
+++ b/src/components/patientRegister/patientRegisterAsbItem.vue
@ -6,6 +6,10 @@
      <el-table-column label="序号" width="50" align="center">
        <template slot-scope="scope">
          <div>
+            <el-popover placement="top-start" :title="scope.row.asbitemName + '：'" width="300" trigger="hover"
+              :content="getAsbItems(scope.row.asbitemId)">
+              <i class="el-icon-view" slot="reference" style="font-size: 14px;color: black;cursor: pointer;" />
+            </el-popover>
            <el-tooltip class="item" effect="dark" content="标五角星表示属于分组或套餐的项目" placement="left">
              <i v-if="scope.row.isBelongGroupPackage == 'Y'" class="el-icon-star-on"
                style="font-size: 16px;color: purple;" />
@ -59,7 +63,9 @@ import { getapi, postapi, putapi, deletapi } from "../../api/api";
 export default {
  components: {},
  data() {
-    return {};
+    return {
+      asbItems: [], // 组合项目包含明细（全）
+    };
  },

  created() {
@ -73,7 +79,8 @@ export default {
  },

  //挂载完成
-  mounted() { 
+  mounted() {
+    this.dictInit()
    this.retrieveregister_check_asbitem(this.dataTransOpts.tableS.patient_register.id)
  },

@ -83,6 +90,26 @@ export default {
  methods: {
    dddw, moment,

+    // 初始化字典信息
+    dictInit() {
+      // 获取组合项目包含的明细
+      postapi('/api/app/Asbitem/GetSimpleAsbitemWithDetails')
+        .then(res => {
+          if (res.code > -1) this.asbItems = res.data
+        })
+    },
+
+    // 通过组合项目，获取包含明细
+    getAsbItems(asbId) {
+      let asbItems = this.asbItems.filter(e => { return e.asbitemId == asbId })
+      // console.log(asbId,asbItems)
+      let ret = []
+      asbItems.forEach(e => {
+        ret.push(' ' + e.itemName)
+      });
+      return `${ret}`
+    },
+
    // 设置颜色 
    setColor(checkCompleteFlag) {
      let color = "#52555F"
@ -174,7 +201,7 @@ export default {
      // immediate:true,
      handler(newVal, oldVal) {
        console.log(`watch 人员登记 newVal:${newVal} oldVal:${oldVal} registerCheckId: ${this.dataTransOpts.tableS.patient_register.id}`);
-        if(newVal != oldVal) this.retrieveregister_check_asbitem(this.dataTransOpts.tableS.patient_register.id)
+        if (newVal != oldVal) this.retrieveregister_check_asbitem(this.dataTransOpts.tableS.patient_register.id)
      }
    },
  }
--- a/src/views/customerReport/combinationDetails.vue
+++ b/src/views/customerReport/combinationDetails.vue
@ -116,7 +116,7 @@
      title="体检单位选择"
      :visible.sync="report.dialogCusOrgOCX"
      :close-on-click-modal="false"
-      width="840px"
+      width="880px"
      height="600px"
    >
      <CusOrgOCX :initDateType="'creationTime'" :useCustomerOrg="true" />
--- a/src/views/customerReport/detailedIitems.vue
+++ b/src/views/customerReport/detailedIitems.vue
@ -151,7 +151,7 @@
      title="体检单位选择"
      :visible.sync="project.dialogCusOrgOCX"
      :close-on-click-modal="false"
-      width="840px"
+      width="880px"
      height="600px"
    >
      <CusOrgOCX :initDateType="'creationTime'" :useCustomerOrg="true" />
--- a/src/views/customerReport/diseaseStatistics.vue
+++ b/src/views/customerReport/diseaseStatistics.vue
@ -170,7 +170,7 @@
      title="体检单位选择"
      :visible.sync="diagnosis.dialogCusOrgOCX"
      :close-on-click-modal="false"
-      width="840px"
+      width="880px"
      height="600px"
    >
      <CusOrgOCX :initDateType="'creationTime'" :useCustomerOrg="true" />
--- a/src/views/customerReport/personnelPositive.vue
+++ b/src/views/customerReport/personnelPositive.vue
@ -74,7 +74,7 @@
    </div>
    <!--通用选单位、体检次数、分组的控件-->
    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
-      :close-on-click-modal="false" width="840px" height="600px">
+      :close-on-click-modal="false" width="880px" height="600px">
      <CusOrgOCX :initDateType="'creationTime'" :useCustomerOrg="true" />
    </el-dialog>  
  </div>
--- a/src/views/customerReport/positiveResultsList.vue
+++ b/src/views/customerReport/positiveResultsList.vue
@ -202,7 +202,7 @@
      title="体检单位选择"
      :visible.sync="diagnosis.dialogCusOrgOCX"
      :close-on-click-modal="false"
-      width="840px"
+      width="880px"
      height="600px"
    >
      <CusOrgOCX :initDateType="'creationTime'" :useCustomerOrg="true" />
--- a/src/views/customerReport/unitSettlement.vue
+++ b/src/views/customerReport/unitSettlement.vue
@ -452,7 +452,7 @@
      title="体检单位选择"
      :visible.sync="report.dialogCusOrgOCX"
      :close-on-click-modal="false"
-      width="840px"
+      width="880px"
      height="600px"
    >
      <CusOrgOCX :initDateType="'creationTime'" :useCustomerOrg="true" />
--- a/src/views/doctorCheck/unitphysicalexamination.vue
+++ b/src/views/doctorCheck/unitphysicalexamination.vue
@ -260,7 +260,7 @@
      </div>
    </div>
    <!--通用选单位、体检次数、分组的控件-->
-    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" width="840px"
+    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" width="880px"
      height="600px">
      <CusOrgOCX :useCustomerOrg="true" :initDateType="'creationTime'" :isUnit="true" />
    </el-dialog>
--- a/src/views/report/chargeAsbitem.vue
+++ b/src/views/report/chargeAsbitem.vue
@ -110,7 +110,7 @@
    </div>
    <!--通用选单位、体检次数、分组的控件-->
    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
-      :close-on-click-modal="false" width="840px" height="600px">
+      :close-on-click-modal="false" width="880px" height="600px">
      <CusOrgOCX/>
    </el-dialog>  
    <!--通用选组合项目的控件-->
--- a/src/views/report/checkStatus.vue
+++ b/src/views/report/checkStatus.vue
@ -109,7 +109,7 @@
      </div>
    </div>
    <!--通用选单位、体检次数、分组的控件-->
-    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" width="840px"
+    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX" :close-on-click-modal="false" width="880px"
      height="600px">
      <CusOrgOCX />
    </el-dialog>
--- a/src/views/report/unCheckAsbitem.vue
+++ b/src/views/report/unCheckAsbitem.vue
@ -101,7 +101,7 @@
    </div>  
    <!--通用选单位、体检次数、分组的控件-->
    <el-dialog title="体检单位选择" :visible.sync="report.dialogCusOrgOCX"
-      :close-on-click-modal="false" width="840px" height="600px">
+      :close-on-click-modal="false" width="880px" height="600px">
      <CusOrgOCX/>
    </el-dialog> 
  </div>