seo

public/sysConfig.json

@@ -1,7 +1,7 @@
 {
-    "apiurl": "http://192.168.0.188:9530",
+    "apiurl": "http://192.168.0.188:9527",
     "softName": "神豚体检管理系统",
-    "pacsApi": "http://192.168.0.188:9530",
+    "pacsApi": "http://192.168.0.188:9527",
     "dcmViewers": "https://app.mzaktj.com:4436",
     "pacsApiHttps": "https://app.mzaktj.com:8042",
     "dict":{

src/components/patientRegister/PatientRegisterForChoose.vue

@@ -8,6 +8,11 @@
             <div v-if="scope.row.creationTime">{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}</div>
           </template>
         </el-table-column>
+        <el-table-column prop="medicalStartDate" label="体检日期" width="100" align="center" sortable>
+          <template slot-scope="scope">
+            <div v-if="scope.row.medicalStartDate">{{ moment(scope.row.medicalStartDate).format("yyyy-MM-DD") }}</div>
+          </template>
+        </el-table-column>
         <el-table-column prop="patientRegisterNo" label="条码号" min-width="110" align="center"/>
         <el-table-column prop="patientNo" label="档案号" sortable align="center"/>
         <el-table-column prop="medicalTimes" label="次数" width="50" align="center" />       

src/components/report/TurnoverReport.vue

@@ -34,13 +34,17 @@
             </el-select>
           </div>
           <div class="query">
-            <span class="spanClass">包含预登记</span>
+            <span class="spanClass">含预登记</span>
             <el-checkbox v-model="query.isPreRegistration" true-label="Y" false-label="N" />
           </div>
           <div class="query">
-            <span class="spanClass">显示子单位</span>
+            <span class="spanClass">含子单位</span>
             <el-checkbox v-model="query.isChild" true-label="Y" false-label="N" @change="btnQuery" />
           </div>
+          <div class="query">
+            <span class="spanClass">单位次数</span>
+            <el-checkbox v-model="query.isCustomerOrgRegister" true-label="Y" false-label="N" @change="btnQuery" />
+          </div>
         </div>
         <div style="display: flex;flex-wrap: wrap;margin-top: 2px; height: 32px;align-items: center;">
           <div class="query">
@@ -70,7 +74,7 @@
           </div>
         </div>
       </div>
-      <div>
+      <div style="display: flex;">
         <el-button type="primary" class="commonbutton" @click="btnQuery" size="small">查询</el-button>
         <el-button class="commonbutton" @click="btnExport('tableData')" size="small">导出</el-button>
       </div>
@@ -79,14 +83,14 @@
       <el-table :data="tableData" border :height="window.pageHeight - 192" highlight-current-row size="small"
         row-key="id" :summary-method="getSummaries" show-summary ref="refTable">
         <el-table-column type="index" label="序号" width="50" align="center" />
-        <el-table-column prop="customerOrgName" label="单位名称" min-width="180">
+        <el-table-column prop="customerOrgName" label="单位名称" min-width="240">
           <template slot-scope="scope">
             <div>{{ query.isChild == 'Y' ? scope.row.customerOrgName + (scope.row.departmentName &&
               scope.row.customerOrgName != scope.row.departmentName ?
               '--' + scope.row.departmentName : '') : scope.row.customerOrgName }}</div>
           </template>
         </el-table-column>
-
+        <el-table-column v-if="query.isCustomerOrgRegister == 'Y' ? true:false" prop="medicalTimes" label="单位次数" min-width="80" align="center" />
         <el-table-column prop="registerCount" label="登记人数" min-width="80" align="center" />
         <el-table-column prop="startMedical" label="检查人数" min-width="80" align="center" />
         <el-table-column prop="checkCount" label="总检人数" min-width="80" align="center" />
@@ -136,6 +140,7 @@ export default {
         // isMedicalTypeId: 'Y',
         isPreRegistration: 'N',
         isChild: 'Y',
+        isCustomerOrgRegister:'N',   // 是否显示单位体检次数
       },
       tableData: [],
 

src/views/fee-settings/cardBillSum.vue

@@ -160,8 +160,7 @@ export default {
       //   "startDate": "string",
       //   "endDate": "string"
       // }      
-
-      postapi('/api/app/cardbill/getcardbilllist', body)
+      postapi('/api/app/CardBill/GetCardBillStatisticsReport', body)
         .then((res) => {
           if (res.code != -1) {
             this.dataList = res.data;