diff --git a/public/sysConfig.json b/public/sysConfig.json
index 5964923..4dc018a 100644
--- a/public/sysConfig.json
+++ b/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":{
diff --git a/src/components/patientRegister/PatientRegisterForChoose.vue b/src/components/patientRegister/PatientRegisterForChoose.vue
index c231822..59f8e98 100644
--- a/src/components/patientRegister/PatientRegisterForChoose.vue
+++ b/src/components/patientRegister/PatientRegisterForChoose.vue
@@ -8,6 +8,11 @@
{{ moment(scope.row.creationTime).format("yyyy-MM-DD") }}
+
+
+ {{ moment(scope.row.medicalStartDate).format("yyyy-MM-DD") }}
+
+
diff --git a/src/components/report/TurnoverReport.vue b/src/components/report/TurnoverReport.vue
index 02c1dbd..3620f35 100644
--- a/src/components/report/TurnoverReport.vue
+++ b/src/components/report/TurnoverReport.vue
@@ -34,13 +34,17 @@
- 包含预登记
+ 含预登记
- 显示子单位
+ 含子单位
+
+ 单位次数
+
+
-
+
查询
导出
@@ -79,14 +83,14 @@
-
+
{{ query.isChild == 'Y' ? scope.row.customerOrgName + (scope.row.departmentName &&
scope.row.customerOrgName != scope.row.departmentName ?
'--' + scope.row.departmentName : '') : scope.row.customerOrgName }}
-
+
@@ -136,6 +140,7 @@ export default {
// isMedicalTypeId: 'Y',
isPreRegistration: 'N',
isChild: 'Y',
+ isCustomerOrgRegister:'N', // 是否显示单位体检次数
},
tableData: [],
diff --git a/src/views/fee-settings/cardBillSum.vue b/src/views/fee-settings/cardBillSum.vue
index 7ae4f91..ac61fde 100644
--- a/src/views/fee-settings/cardBillSum.vue
+++ b/src/views/fee-settings/cardBillSum.vue
@@ -159,9 +159,8 @@ export default {
// "billFlag": "string",
// "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;