seo

src/components/doctorCheck/PatientRegisterBase2.vue

@@ -104,7 +104,7 @@
     <!-- 体检人员记录列表 -->
     <el-dialog title="体检人员列表" :visible.sync="dialogWin.PatientRegisterForChoose" width="800px" :show-close="false"
       :close-on-click-modal="false" :append-to-body="true">
-      <PatientRegisterForChoose :params="PatientRegisterList" />
+      <PatientRegisterForChoose :params="PatientRegisterList" @chooseBak="chooseBak"/>
     </el-dialog>
 
   </div>
@@ -192,6 +192,12 @@ export default {
     ...mapMutations(['doctorCheckPrBaseInit', 'sumPREditInit']),
     dddw, moment,
 
+    // 选择人员返回
+    chooseBak(chooseData){
+      this.prBase.patientRegisterNo = chooseData.patientRegisterNo
+      this.onQueryByOnlyNo('patientRegisterNo')
+    },
+
     //查询后触发相关信息处理
     afterFind(rd) {      
       this.$emit("triggerQuery",rd)
@@ -222,6 +228,7 @@ export default {
     },
 
 
+
     // 根据pacs条码查询
     onQueryByPacsNo(checkRequestNo) {
       postapi('/api/app/PatientRegister/GetPatientRegisterNoByCheckRequestNo', { checkRequestNo }).then(res => {
@@ -477,6 +484,7 @@ export default {
         if(newVal && newVal != oldVal){
         // this.getPatientRegister(this.prBase.patientRegisterNo)
         // this.dataTransOpts.refresh.register_check.M++
+          this.prBase = Object.assign({},this.prBase,this.refParams)
         }
       }
     },
@@ -487,7 +495,7 @@ export default {
       handler(newVal, oldVal) {
         console.log(`watch.refParams.resetTimes newVal: ${newVal} oldVal: ${oldVal}`);
         if(newVal && newVal != oldVal){
-          this.prBase = Object.assign(this.prBase,this.prBaseInit)
+          this.prBase = Object.assign({},this.prBase,this.prBaseInit)
         }        
       }
     },

src/components/doctorCheck/PatientRegisterList.vue

@@ -5,7 +5,7 @@
       <div v-if="winAbsolute" style="position: absolute;top:3px;right:0px;">
         <el-tooltip content="关闭人员列表窗口" placement="bottom" effect="light">
           <i class="el-icon-close"
-            @click="doctorCheck.doctorCheckDialogVisible = false; sumDoctorCheck.sumDoctorCheckDialogVisible = false;"
+            @click="closePrList"
             style="font-size: 24px;color: red;cursor:pointer;"></i>
         </el-tooltip>
       </div>
@@ -274,7 +274,7 @@ export default {
     // })
   },
   computed: {
-    ...mapState(["window", "dataTransOpts", "dict", "customerOrg", "patientRegister", "doctorCheck", "sumDoctorCheck", "report"]),
+    ...mapState(["window", "dialogWin","dataTransOpts", "dict", "customerOrg", "patientRegister", "doctorCheck", "sumDoctorCheck", "report"]),
     divHeight() {
       if (this.win == "doctorCheck") {
         return 210
@@ -372,6 +372,17 @@ export default {
 
     },
 
+    // 关闭显示窗口
+    closePrList(){
+      this.doctorCheck.doctorCheckDialogVisible = false; 
+      this.sumDoctorCheck.sumDoctorCheckDialogVisible = false;      
+      // 新的
+      if(this.win == 'doctorCheck'){
+        this.dialogWin.doctorPrList = false
+      }else{
+        this.dialogWin.sumPrList = false
+      }
+    },
 
     //快速选择组合项目时，调整可按拼间简码及简称查找
     filterMethod(keyWords) {
@@ -435,6 +446,7 @@ export default {
       this.oneClick = 0;
       this.DbClick = 0;
 
+      this.$emit("choosedBak",row)
       this.dataTransOpts.tableS.patient_register = deepCopy(row)
       // setTimeout(() => {
       this.dataTransOpts.refresh.patient_register.S++ //人员体检登记信息刷新

src/components/patientRegister/PatientRegisterForChoose.vue

@@ -162,12 +162,15 @@ export default {
       if(!this.tableDataCurrentRow.id){
         this.$message.warning({ showClose: true, message: "请选择体检人员！"})
         return
-      }
+      }      
       this.dataTransOpts.tableS.patient_register = deepCopy(this.tableDataCurrentRow)
       this.dataTransOpts.refresh.patient_register.S++
       setTimeout(() => {
         this.tableDataCurrentRow = {}
       }, 10);   
+
+      this.$emit("chooseBak",this.tableDataCurrentRow)  //将选中的数据返回到父组件
+
       this.dialogWin.PatientRegisterForChoose = false
     },
   

src/components/patientRegister/patientRegisterQuery.vue

@@ -153,7 +153,7 @@ export default {
         customerOrgTopId: "", //单位顶级ID
         isSeries: 'N',  // 是否连续扫码
         photo: '',  // 参数控制 读身份证查询时，是否更新照片用
-
+        customerOrgName:'', //部门名称
         // 查询条件 ================== Start ======================
         dateType: '2', //体检日期        
         startDate: null,
@@ -251,19 +251,23 @@ export default {
     },
 
     changeOrgId(customerOrgId) {
+
+      this.query.customerOrgId = customerOrgId
+      this.query.customerOrgName = this.refParams.customerOrgName
+
       if (!customerOrgId || customerOrgId == this.dict.personOrgId) {
-        this.query.customerOrgRegister = null
+        this.query.customerOrgTopId = this.dict.personOrgId
+        this.query.customerOrgRegister = null        
         this.customerOrgRegisterList = []
         if (customerOrgId == this.dict.personOrgId) {
-          let today = new Date()
+          let today = moment(new Date()).format('yyyy-MM-DD')
           this.query.startDate = today
           this.query.endDate = today
         }
         return
       }
 
-      this.query.customerOrgId = customerOrgId
-      this.query.customerOrgName = this.refParams.customerOrgName
+      
 
       // 获取顶级ID (优化无需获取顶级ID)
       if (this.refParams?.parentNodes.length > 1) {
@@ -308,11 +312,11 @@ export default {
     // 选择体检次数
     changeCustomerOrgRegister(v) {
       // console.log('changeCustomerOrgRegister')
-      this.query.startDate = new Date(v.beginTime)
+      this.query.startDate = moment(new Date(v.beginTime)).format('yyyy-MM-DD')
       if (v.isComplete == 'Y') {
-        this.query.endDate = new Date(v.endTime)
+        this.query.endDate = moment(new Date(v.endTime)).format('yyyy-MM-DD')
       } else {
-        this.query.endDate = new Date()
+        this.query.endDate = moment(new Date()).format('yyyy-MM-DD')
       }
       if (v && v.id) this.getCustomerOrgGroup(v.id)
     },

src/components/sumDoctorCheck/SumAsbItemStatus.vue

@@ -37,7 +37,7 @@ import { getapi, postapi, putapi, deletapi } from "@/api/api";
 
 export default {
   components: {},
-  props: ['patientRegisterId','tabChoosed'],
+  props: ['patientRegisterId','tabChoosed','brushSummary'],
   data() {
     return {
       data: {
@@ -103,6 +103,17 @@ export default {
       }
     },
 
+    // 传入参数控制
+    "brushSummary": {
+      // immediate:true,
+      handler(newVal, oldVal) {
+        console.log(`watch 总检--检查状态汇总 newVal: ${newVal}, oldVal: ${oldVal} patientRegisterId: ${this.patientRegisterId}`);
+        // && this.tabChoosed == '1'
+        if(newVal && newVal != oldVal) this.getSumAsbItemStatus(this.patientRegisterId);
+      }
+    },
+
+
   },
 
 };

src/views/doctorCheck/sumDoctorCheck.vue

@@ -77,7 +77,7 @@
                       </el-table-column>
                     </el-table>
                     <div style="height: 90px;" v-show="history_summary_years_limit == '0' ? false : true">
-                      <el-input type="textarea" v-model="sumDoctorCheck.historySummary" placeholder="历史综述"
+                      <el-input type="textarea" v-model="patient_register.historySummary" placeholder="历史综述"
                         :disabled="sumBtnDisabled" :autosize="{ minRows: 5, maxRows: 5 }" style="z-index: 2;">
                       </el-input>
                     </div>
@@ -349,7 +349,8 @@
                 </div>
                 <!-- 检查情况 -->
                 <div style="margin-top: -6px;">
-                  <SumAsbItemStatus :patientRegisterId="patient_register.id" :tabChoosed="tabChoosed" />
+                  <SumAsbItemStatus :patientRegisterId="patient_register.id" :tabChoosed="tabChoosed"
+                    :brushSummary="refParamsQuery.brushSummary" />
                 </div>
 
               </el-tab-pane>
@@ -418,16 +419,17 @@
             <el-button type="primary" class="commonbutton" @click="btnSave" :disabled="sumBtnDisabled">保存</el-button>
           </div>
           <div v-show="checkPagePriv(pagePriv.privs, '修改')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="btnEdit" :disabled="sumBtnDisabled">修改</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnEdit" :disabled="sumedBtnDisabled">修改</el-button>
           </div>
           <div v-show="checkPagePriv(pagePriv.privs, '取消总检')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="btnDel" :disabled="sumBtnDisabled">取消总检</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnDel" :disabled="sumedBtnDisabled">取消总检</el-button>
           </div>
           <div v-show="checkPagePriv(pagePriv.privs, '审核')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="audit" :disabled="sumBtnDisabled">审核</el-button>
+            <el-button type="primary" class="commonbutton" @click="btnAudit" :disabled="sumedBtnDisabled">审核</el-button>
           </div>
           <div v-show="checkPagePriv(pagePriv.privs, '取消审核')" class="listBtn">
-            <el-button type="primary" class="commonbutton" @click="unAudit" :disabled="sumBtnDisabled">取消审核</el-button>
+            <el-button type="primary" class="commonbutton" @click="unAudit"
+              :disabled="auditBtnDisabled">取消审核</el-button>
           </div>
           <!-- 直接放在 建议旁边
         <div class="listBtn">
@@ -492,7 +494,7 @@
           <div v-show="dialogWin.sumPrList"
             :style="`z-index:3;border-radius: 10px;border: 1px solid #ddd;background-color:#FFF; position: absolute;top:50px;right:120px;width:350px;height: ${window.pageHeight - 42 - 10}px;opacity:1;`">
 
-            <PatientRegisterList win="sumDoctorCheck" :winAbsolute="true" @choosedBak="choosedBak"/>
+            <PatientRegisterList win="sumDoctorCheck" :winAbsolute="true" @choosedBak="choosedBak" />
 
           </div>
         </div>
@@ -544,6 +546,7 @@
 <script>
 import { mapState } from 'vuex';
 import Sortable from "sortablejs";
+import moment from "moment";
 import { getapi, postapi, putapi, deletapi, fetchStream } from "@/api/api";
 import { arrayExistObj, arrayReduce, tcdate, getPagePriv, checkPagePriv, deepCopy, objCopy } from "../../utlis/proFunc";
 
@@ -598,7 +601,10 @@ export default {
         auditDoctorId: '',
         auditDate: '',
         isAudit: 'N',
-        sexId:'',
+        isLock: 'N',
+        sexId: '',
+        completeFlag: '2',  //总检状态
+        historySummary: '', // 历史综述
       },
 
       // 综述建议部份
@@ -679,7 +685,6 @@ export default {
       this.patient_register = this.$route.query.patient_register
     } else {
       this.patient_register = { id: '', patientRegisterNo: '' }
-      this.dataTransOpts.tableS.register_check = { id: '' }
     }
 
     //获取用户当前页面的权限
@@ -745,9 +750,9 @@ export default {
       "dict",
       "dataTransOpts",
       "dialogWin",
-      "patientRegister",
-      "customerOrg",
-      "sumDoctorCheck",
+      //"patientRegister",
+      //"customerOrg",
+      //"sumDoctorCheck",
     ]),
 
     frameHeight() {
@@ -774,39 +779,67 @@ export default {
       return Math.floor((this.window.pageWidth - 120) / 2)
     },
 
+    // 有人员，无总检（加参数控制，综述建议是否可修改）
     sumBtnDisabledAddSummary() {
-      let patientRegister = this.dataTransOpts.tableS.patient_register
       let ret = true
 
       //' 请选择体检人员'
-      if (!patientRegister.id) return ret
+      if (!this.patient_register.id) return ret
       // '人员已锁定，不可执行此操作'
-      if (patientRegister?.isLock == 'Y') return ret
+      if (this.patient_register?.isLock == 'Y') return ret
 
-      if (patientRegister.completeFlag && patientRegister.completeFlag != '3' && this.summary_check_default_summay_modifiable == 'Y') {
+      if (this.patient_register?.completeFlag != '3' && this.summary_check_default_summay_modifiable == 'Y') {
         return false;
       } else {
         return true;
       }
     },
 
+    // 有人员，无总检
     sumBtnDisabled() {
-      let patientRegister = this.dataTransOpts.tableS.patient_register
       let ret = true
 
       //' 请选择体检人员'
-      if (!patientRegister.id) return ret
+      if (!this.patient_register.id) return ret
       // '人员已锁定，不可执行此操作'
-      if (patientRegister?.isLock == 'Y') return ret
+      if (this.patient_register?.isLock == 'Y') return ret
 
       // console.log('btnType', btnType, this.summary_check_default_summay_modifiable)      
-      if (patientRegister.completeFlag && patientRegister.completeFlag != '3') ret = false
+      if (this.patient_register?.completeFlag != '3') ret = false
 
       return ret
     },
 
+    // 总检了才可用的按钮
+    sumedBtnDisabled() {
+      let ret = true
+
+      //' 请选择体检人员'
+      if (!this.patient_register.id) return ret
+      // '人员已锁定，不可执行此操作'
+      if (this.patient_register?.isLock == 'Y') return ret
+      if (this.patient_register.completeFlag && this.patient_register.completeFlag == '3' && this.patient_register?.isAudit != 'Y') ret = false
+
+      return ret
+    },
+
+    // 审核了才可用的按钮
+    auditBtnDisabled() {
+      let ret = true
+
+      //' 请选择体检人员'
+      if (!this.patient_register.id) return ret
+      // '人员已锁定，不可执行此操作'
+      if (this.patient_register?.isLock == 'Y') return ret
+      if (this.patient_register?.isAudit == 'Y') ret = false
+
+      return ret
+    },
+
+
+    // 拆叠是否可操作
     sumBtnDisabledCollapse() {
-      let patientRegister = this.dataTransOpts.tableS.patient_register
+      let patientRegister = this.patient_register
       let ret = true
 
       //' 请选择体检人员'
@@ -992,38 +1025,42 @@ export default {
 
     // 根据人员ID 查询总检数据
     triggerQuery(rd) {
-      console.log('triggerQuery.rd', rd)
-      this.patient_register = Object.assign(this.patient_register,rd)
-      this.refParamsQuery = Object.assign({}, this.refParamsQuery, rd, 
-      { brushSummary: Number(this.refParamsQuery.brushSummary) + 1  //触发综述建议刷新
-       }
-    )
-      
-      console.log('this.patient_register',this.patient_register)
+      // console.log('triggerQuery.rd', rd)
+      this.patient_register = Object.assign({}, this.patient_register, rd)
+      this.refParamsQuery = Object.assign({}, this.refParamsQuery, rd,
+        {
+          brushSummary: Number(this.refParamsQuery.brushSummary) + 1  //触发综述建议刷新
+        }
+      )
+      // console.log('this.summary_check_default_summay_modifiable', this.summary_check_default_summay_modifiable)
+      // console.log('this.patient_register', this.patient_register)
       //brushSummary++ 刷新综述建议
     },
 
     // 人员列表选中数据
-    choosedBak(choosedData){
+    choosedBak(choosedData) {
       console.log('choosedBak.choosedData', choosedData)
-      this.patient_register = Object.assign(this.patient_register,rd)
-      this.refParamsQuery = Object.assign({}, this.refParamsQuery, rd, 
-      { brushSummary: Number(this.refParamsQuery.brushSummary) + 1 , //触发综述建议刷新
-        brushQueryDisp:Number(this.refParamsQuery.brushQueryDisp) + 1 // 触发人员信息刷新
-      }
-    )
-      
-      console.log('this.patient_register',this.patient_register)
+      // 获取人员信息
+      this.getInfoByPatientRegisterNo(choosedData.patientRegisterNo)
+        .then(() => {
+          console.log('this.patient_register', this.patient_register)
+          this.refParamsQuery = Object.assign({}, this.refParamsQuery, this.patient_register,
+            {
+              brushSummary: Number(this.refParamsQuery.brushSummary) + 1, //触发综述建议刷新
+              brushQueryDisp: Number(this.refParamsQuery.brushQueryDisp) + 1 // 触发人员信息刷新
+            }
+          )
+        })
     },
 
     // 人员列表按钮
-    btnPrList() {      
+    btnPrList() {
       this.dialogWin.sumPrList = true
     },
 
     //诊断列表
     addDiagnosis() {
-      this.sumDoctorCheck.sumDiagnosisVisible = true
+      // 旧的方式，现不用
     },
 
     //to医生诊台
@@ -1129,7 +1166,7 @@ export default {
         summaryDoctorId: this.patient_register.summaryDoctorId || null,
         summaryDate: this.patient_register.summaryDate || moment(new Date()).format("yyyy-MM-DD HH:mm:ss"),
         medicalConclusionId: this.patient_register.medicalConclusionId || null,
-        summaryHistoricalReview: this.sumDoctorCheck.historySummary,
+        summaryHistoricalReview: this.patient_register.historySummary,
         sumSummarys: this.summaryList,
         sumSuggestions: this.suggestionList
       }
@@ -1197,15 +1234,20 @@ export default {
       postapi(`/api/app/patientregister/UpdatePatientRegisterSummarySuggestion`, body)
         .then((res) => {
           if (res.code > -1) {
-            // this.patient_register.completeFlag = '3';
-            this.dataTransOpts.refresh.patient_register.S++
+            //this.patient_register.completeFlag = '3';
+            this.getInfoByPatientRegisterNo(this.patient_register.patientRegisterNo)
+              .then(() => {
+                this.refParamsQuery.brushSummary++
+              })
           }
         })
     },
 
     //修改结果
     btnEdit() {
-      this.patient_register.completeFlag = '2'
+      //this.patient_register.completeFlag = '2'  // 直接改没有触发计算函数      
+      this.patient_register = Object.assign({}, this.patient_register, { completeFlag: '2' })
+      // console.log('this.patient_register', this.patient_register)
     },
 
     //取消总检
@@ -1342,8 +1384,13 @@ export default {
         this.AI.height = 24
       }
     },
+
     //审核
-    audit() {
+    btnAudit() {
+      if (this.patient_register.completeFlag != '3') {
+        this.$message.warning({ showClose: true, message: '尚未总检，不可执行此操作！' })
+        return
+      }
       // patient_register.summaryDoctorId
       // patient_register.auditDoctorId
       let auditDoctorId = this.patient_register.auditDoctorId
@@ -1503,7 +1550,7 @@ export default {
       let id = String(new Date().getTime())
       let pojo = {
         id,
-        patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
+        patientRegisterId: this.patient_register.id,
         summaryTitle: '',
         details: [{
           id: 'detail' + id,
@@ -1523,7 +1570,8 @@ export default {
       let id = Date.now() + String(this.suggestionList.length)
       let pojo = {
         id,
-        patientRegisterId: this.dataTransOpts.tableS.patient_register.id,
+        collapse:this.collapse,
+        patientRegisterId: this.patient_register.id,
         suggestionTitle: '',
         diagnosisIds: [],
         medicalInterpretations: [
@@ -1739,19 +1787,38 @@ export default {
       this.dialogDiagnosises = false
     },
 
+    // 通过条码号获取人员信息
+    getInfoByPatientRegisterNo(patientRegisterNo) {
+      return new Promise((resolve, reject) => {
+        let body = {
+          patientRegisterNo
+        }
+        postapi('/api/app/patientregister/GetAlreadyRegisterPatientRegisterByNo', body)
+          .then(res => {
+            if (res.code > -1) {
+              this.patient_register = Object.assign({}, this.patient_register, res.data)
+            }
+          })
+          .finally(() => {
+            resolve()
+          })
+      })
+    },
+
     // 获取人员是否已总检过
     getHaveSumData(patientRegisterId) {
       this.summaryList = [];
       this.suggestionList = [];
       if (!patientRegisterId) return
 
-      // console.log('getHaveSumData', this.dataTransOpts.tableS.patient_register.completeFlag)
-      if (this.dataTransOpts.tableS.patient_register.completeFlag == '3') {
+      // console.log('getHaveSumData', this.patient_register.completeFlag)
+      if (this.patient_register.completeFlag == '3') {
         this.getSummaryList(patientRegisterId, 'Y')
         this.getHistorySummary(patientRegisterId, 'Y')
         this.getSuggestionList(patientRegisterId, 'Y')
         return
       }
+
       postapi('/api/app/patientregister/GetHaveSumData', { patientRegisterId })
         .then(async (res) => {
           if (res.code > -1) {
@@ -1828,7 +1895,7 @@ export default {
       if (this.history_summary_years_limit == '0') return
 
       if (!patientRegisterId) {
-        this.sumDoctorCheck.historySummary = '';
+        this.patient_register.historySummary = '';
         return
       }
 
@@ -1840,7 +1907,7 @@ export default {
         .then((res) => {
           // console.log("summaryList", res.data);
           if (res.code > -1) {
-            this.sumDoctorCheck.historySummary = res.data.summaryHistoricalReview
+            this.patient_register.historySummary = res.data.summaryHistoricalReview
           }
         })
 
@@ -2159,7 +2226,7 @@ export default {
 
     // 打开特殊符号输入
     openSymbols(index, colName, subIndex) {
-      if (this.dataTransOpts.tableS.patient_register.completeFlag == '3') return
+      if (this.patient_register.completeFlag == '3') return
       this.dbclObj = { index, colName, subIndex }
       switch (colName) {
         case 'suggestionTitle':