pengjun 1 day ago
parent
commit
c08807ec84
  1. 9
      src/components/patientRegister/PatientRegisterList.vue
  2. 6
      src/components/report/TurnoverReportOrg.vue

9
src/components/patientRegister/PatientRegisterList.vue

@ -2891,9 +2891,9 @@ export default {
newRow.sexId, newRow.sexId,
"displayName" "displayName"
); );
if (newRow.patientRegisterNo)
newRow.patientRegisterNo = "\u200C" + newRow.patientRegisterNo;
if (newRow.patientNo) newRow.patientNo = "\u200C" + newRow.patientNo;
// if (newRow.patientRegisterNo)
// newRow.patientRegisterNo = "\u200C" + newRow.patientRegisterNo;
// if (newRow.patientNo) newRow.patientNo = "\u200C" + newRow.patientNo;
if ( if (
newRow.medicalPackageId !== this.dict.personOrgId && newRow.medicalPackageId !== this.dict.personOrgId &&
newRow.customerOrgId === this.dict.personOrgId newRow.customerOrgId === this.dict.personOrgId
@ -2905,7 +2905,8 @@ export default {
) { ) {
newRow.groupPack = newRow.customerOrgGroupName; newRow.groupPack = newRow.customerOrgGroupName;
} }
if (newRow.idNo) newRow.idNo = "\u200C" + newRow.idNo;
//if (newRow.idNo) newRow.idNo = "\u200C" + newRow.idNo;
//if (newRow.idNo) newRow.idNo = " " + newRow.idNo;
if (newRow.birthDate) if (newRow.birthDate)
newRow.birthDate = moment(newRow.birthDate).format("yyyy-MM-DD"); newRow.birthDate = moment(newRow.birthDate).format("yyyy-MM-DD");
if (newRow.medicalTypeId) if (newRow.medicalTypeId)

6
src/components/report/TurnoverReportOrg.vue

@ -415,14 +415,14 @@ export default {
// itemTypeName: 'CT', // itemTypeName: 'CT',
// itemDetails: [ // itemDetails: [
// { // {
// asbitemName: 'CT', djrs: 4, yjrs: 2, bzje: 6, ysje: 8, ssje: 10,
// asbitemName: 'CT',
// details: [ // details: [
// { org: 'C', djrs: 3, yjrs: 2, bzje: 3, ysje: 4, ssje: 6 }, // { org: 'C', djrs: 3, yjrs: 2, bzje: 3, ysje: 4, ssje: 6 },
// { org: 'B', djrs: 1, yjrs: 0, bzje: 3, ysje: 4, ssje: 2 } // { org: 'B', djrs: 1, yjrs: 0, bzje: 3, ysje: 4, ssje: 2 }
// ] // ]
// }, // },
// { // {
// asbitemName: 'CT', djrs: 2, yjrs: 1, bzje: 3, ysje: 4, ssje: 5,
// asbitemName: 'CT',
// details: [ // details: [
// { org: 'C', djrs: 2, yjrs: 1, bzje: 3, ysje: 4, ssje: 5 }, // { org: 'C', djrs: 2, yjrs: 1, bzje: 3, ysje: 4, ssje: 5 },
// { org: 'B', djrs: 0, yjrs: 0, bzje: 0, ysje: 0, ssje: 0 } // { org: 'B', djrs: 0, yjrs: 0, bzje: 0, ysje: 0, ssje: 0 }
@ -430,7 +430,7 @@ export default {
// } // }
// ] // ]
// } // }
// ], //
// ],
let pojo = {}; let pojo = {};
this.tableData.forEach(e1 => { this.tableData.forEach(e1 => {

Loading…
Cancel
Save