|
@@ -254,29 +254,29 @@ func (c *PatientApiController) CreatePatient() {
|
254
|
254
|
//获取老表的最后一条数据
|
255
|
255
|
patients, err := service.GetLastPatientData(adminUserInfo.CurrentOrgId)
|
256
|
256
|
patientsNew := models.XtPatientsNew{
|
257
|
|
- UserOrgId: adminUserInfo.CurrentOrgId,
|
258
|
|
- UserId: 0,
|
259
|
|
- Avatar: patients.Avatar,
|
260
|
|
- PatientType: patients.PatientType,
|
261
|
|
- DialysisNo: patients.DialysisNo,
|
262
|
|
- AdmissionNumber: patients.AdmissionNumber,
|
263
|
|
- Source: patients.Source,
|
264
|
|
- Lapseto: patients.Lapseto,
|
265
|
|
- PartitionId: patients.PartitionId,
|
266
|
|
- BedId: patients.BedId,
|
267
|
|
- Name: patients.Name,
|
268
|
|
- Alias: patients.Alias,
|
269
|
|
- Gender: patients.Gender,
|
270
|
|
- MaritalStatus: patients.MaritalStatus,
|
271
|
|
- IdCardNo: patients.IdCardNo,
|
272
|
|
- Birthday: patients.Birthday,
|
273
|
|
- ReimbursementWayId: patients.ReimbursementWayId,
|
274
|
|
- HealthCareType: patients.HealthCareType,
|
275
|
|
- HealthCareNo: patients.HealthCareNo,
|
276
|
|
- HealthCareDueDate: patients.HealthCareDueDate,
|
277
|
|
- Height: patients.Height,
|
278
|
|
- BloodType: patients.BloodType,
|
279
|
|
- Rh: patients.Rh,
|
|
257
|
+ UserOrgId: adminUserInfo.CurrentOrgId,
|
|
258
|
+ UserId: 0,
|
|
259
|
+ Avatar: patients.Avatar,
|
|
260
|
+ PatientType: patients.PatientType,
|
|
261
|
+ DialysisNo: patients.DialysisNo,
|
|
262
|
+ AdmissionNumber: patients.AdmissionNumber,
|
|
263
|
+ Source: patients.Source,
|
|
264
|
+ Lapseto: patients.Lapseto,
|
|
265
|
+ PartitionId: patients.PartitionId,
|
|
266
|
+ BedId: patients.BedId,
|
|
267
|
+ Name: patients.Name,
|
|
268
|
+ Alias: patients.Alias,
|
|
269
|
+ Gender: patients.Gender,
|
|
270
|
+ MaritalStatus: patients.MaritalStatus,
|
|
271
|
+ IdCardNo: patients.IdCardNo,
|
|
272
|
+ Birthday: patients.Birthday,
|
|
273
|
+ ReimbursementWayId: patients.ReimbursementWayId,
|
|
274
|
+ HealthCareType: patients.HealthCareType,
|
|
275
|
+ HealthCareNo: patients.HealthCareNo,
|
|
276
|
+ HealthCareDueDate: patients.HealthCareDueDate,
|
|
277
|
+ Height: patients.Height,
|
|
278
|
+ BloodType: patients.BloodType,
|
|
279
|
+ Rh: patients.Rh,
|
280
|
280
|
HealthCareDueAlertDate: patients.HealthCareDueAlertDate,
|
281
|
281
|
EducationLevel: patients.EducationLevel,
|
282
|
282
|
Profession: patients.Profession,
|
|
@@ -322,28 +322,28 @@ func (c *PatientApiController) CreatePatient() {
|
322
|
322
|
Nation: patients.Nation,
|
323
|
323
|
NativePlace: patients.NativePlace,
|
324
|
324
|
Age: patients.Age,
|
325
|
|
- InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
|
326
|
|
- IsInfectious: patients.IsInfectious,
|
327
|
|
- RemindCycle: patients.RemindCycle,
|
328
|
|
- ResponseResult: patients.ResponseResult,
|
329
|
|
- IsOpenRemind: patients.IsOpenRemind,
|
330
|
|
- FirstTreatmentDate: patients.FirstTreatmentDate,
|
331
|
|
- DialysisAge: patients.DialysisAge,
|
332
|
|
- ExpenseKind: patients.ExpenseKind,
|
333
|
|
- TellPhone: patients.TellPhone,
|
334
|
|
- ContactName: patients.ContactName,
|
335
|
|
- BloodPatients: 1,
|
336
|
|
- SlowPatients: 0,
|
337
|
|
- MemberPatients: 0,
|
338
|
|
- EcommerPatients: "",
|
339
|
|
- BloodId: patients.ID,
|
340
|
|
- SlowId: 0,
|
341
|
|
- MemberId: 0,
|
342
|
|
- MemberFistdate: 0,
|
343
|
|
- MemberPatienttype: 0,
|
344
|
|
- MemberTreatement: 0,
|
345
|
|
- EquitmentId: "",
|
346
|
|
- UserSysBeforeCount: patient.UserSysBeforeCount,
|
|
325
|
+ InfectiousNextRecordTime: patients.InfectiousNextRecordTime,
|
|
326
|
+ IsInfectious: patients.IsInfectious,
|
|
327
|
+ RemindCycle: patients.RemindCycle,
|
|
328
|
+ ResponseResult: patients.ResponseResult,
|
|
329
|
+ IsOpenRemind: patients.IsOpenRemind,
|
|
330
|
+ FirstTreatmentDate: patients.FirstTreatmentDate,
|
|
331
|
+ DialysisAge: patients.DialysisAge,
|
|
332
|
+ ExpenseKind: patients.ExpenseKind,
|
|
333
|
+ TellPhone: patients.TellPhone,
|
|
334
|
+ ContactName: patients.ContactName,
|
|
335
|
+ BloodPatients: 1,
|
|
336
|
+ SlowPatients: 0,
|
|
337
|
+ MemberPatients: 0,
|
|
338
|
+ EcommerPatients: "",
|
|
339
|
+ BloodId: patients.ID,
|
|
340
|
+ SlowId: 0,
|
|
341
|
+ MemberId: 0,
|
|
342
|
+ MemberFistdate: 0,
|
|
343
|
+ MemberPatienttype: 0,
|
|
344
|
+ MemberTreatement: 0,
|
|
345
|
+ EquitmentId: "",
|
|
346
|
+ UserSysBeforeCount: patient.UserSysBeforeCount,
|
347
|
347
|
}
|
348
|
348
|
|
349
|
349
|
err = service.CreatePatientsNew(&patientsNew)
|
|
@@ -481,28 +481,28 @@ func (c *PatientApiController) EditPatient() {
|
481
|
481
|
return
|
482
|
482
|
}
|
483
|
483
|
patientsNew := models.XtPatientsNew{
|
484
|
|
- UserOrgId: patient.UserOrgId,
|
485
|
|
- UserId: patient.UserId,
|
486
|
|
- Avatar: patient.Avatar,
|
487
|
|
- PatientType: patient.PatientType,
|
488
|
|
- DialysisNo: patient.DialysisNo,
|
489
|
|
- AdmissionNumber: patient.AdmissionNumber,
|
490
|
|
- Source: patient.Source,
|
491
|
|
- PartitionId: patient.PartitionId,
|
492
|
|
- BedId: patient.BedId,
|
493
|
|
- Name: patient.Name,
|
494
|
|
- Alias: patient.Alias,
|
495
|
|
- Gender: patient.Gender,
|
496
|
|
- MaritalStatus: patient.MaritalStatus,
|
497
|
|
- IdCardNo: patient.IdCardNo,
|
498
|
|
- Birthday: patient.Birthday,
|
499
|
|
- ReimbursementWayId: patient.ReimbursementWayId,
|
500
|
|
- HealthCareType: patient.HealthCareType,
|
501
|
|
- HealthCareNo: patient.HealthCareNo,
|
502
|
|
- HealthCareDueDate: patient.HealthCareDueDate,
|
503
|
|
- Height: patient.Height,
|
504
|
|
- BloodType: patient.BloodType,
|
505
|
|
- Rh: patient.Rh,
|
|
484
|
+ UserOrgId: patient.UserOrgId,
|
|
485
|
+ UserId: patient.UserId,
|
|
486
|
+ Avatar: patient.Avatar,
|
|
487
|
+ PatientType: patient.PatientType,
|
|
488
|
+ DialysisNo: patient.DialysisNo,
|
|
489
|
+ AdmissionNumber: patient.AdmissionNumber,
|
|
490
|
+ Source: patient.Source,
|
|
491
|
+ PartitionId: patient.PartitionId,
|
|
492
|
+ BedId: patient.BedId,
|
|
493
|
+ Name: patient.Name,
|
|
494
|
+ Alias: patient.Alias,
|
|
495
|
+ Gender: patient.Gender,
|
|
496
|
+ MaritalStatus: patient.MaritalStatus,
|
|
497
|
+ IdCardNo: patient.IdCardNo,
|
|
498
|
+ Birthday: patient.Birthday,
|
|
499
|
+ ReimbursementWayId: patient.ReimbursementWayId,
|
|
500
|
+ HealthCareType: patient.HealthCareType,
|
|
501
|
+ HealthCareNo: patient.HealthCareNo,
|
|
502
|
+ HealthCareDueDate: patient.HealthCareDueDate,
|
|
503
|
+ Height: patient.Height,
|
|
504
|
+ BloodType: patient.BloodType,
|
|
505
|
+ Rh: patient.Rh,
|
506
|
506
|
HealthCareDueAlertDate: patient.HealthCareDueAlertDate,
|
507
|
507
|
EducationLevel: patient.EducationLevel,
|
508
|
508
|
Profession: patient.Profession,
|
|
@@ -544,19 +544,19 @@ func (c *PatientApiController) EditPatient() {
|
544
|
544
|
Nation: patient.Nation,
|
545
|
545
|
NativePlace: patient.NativePlace,
|
546
|
546
|
Age: patient.Age,
|
547
|
|
- InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
|
548
|
|
- IsInfectious: patient.IsInfectious,
|
549
|
|
- RemindCycle: patient.RemindCycle,
|
550
|
|
- ResponseResult: patient.ResponseResult,
|
551
|
|
- IsOpenRemind: patient.IsOpenRemind,
|
552
|
|
- FirstTreatmentDate: patient.FirstTreatmentDate,
|
553
|
|
- DialysisAge: patient.DialysisAge,
|
554
|
|
- ExpenseKind: patient.ExpenseKind,
|
555
|
|
- TellPhone: patient.TellPhone,
|
556
|
|
- ContactName: patient.ContactName,
|
557
|
|
- UpdatedTime: time.Now().Unix(),
|
558
|
|
- BloodPatients: 1,
|
559
|
|
- Lapseto: patient.Lapseto,
|
|
547
|
+ InfectiousNextRecordTime: patient.InfectiousNextRecordTime,
|
|
548
|
+ IsInfectious: patient.IsInfectious,
|
|
549
|
+ RemindCycle: patient.RemindCycle,
|
|
550
|
+ ResponseResult: patient.ResponseResult,
|
|
551
|
+ IsOpenRemind: patient.IsOpenRemind,
|
|
552
|
+ FirstTreatmentDate: patient.FirstTreatmentDate,
|
|
553
|
+ DialysisAge: patient.DialysisAge,
|
|
554
|
+ ExpenseKind: patient.ExpenseKind,
|
|
555
|
+ TellPhone: patient.TellPhone,
|
|
556
|
+ ContactName: patient.ContactName,
|
|
557
|
+ UpdatedTime: time.Now().Unix(),
|
|
558
|
+ BloodPatients: 1,
|
|
559
|
+ Lapseto: patient.Lapseto,
|
560
|
560
|
}
|
561
|
561
|
// //更新病人ID获取新表病人ID
|
562
|
562
|
err = service.UpdatepatientTwo(&patientsNew, id)
|
|
@@ -856,6 +856,7 @@ func (c *PatientApiController) UpdateDialysisSolution() {
|
856
|
856
|
DialysateTemperature: solution.DialysateTemperature,
|
857
|
857
|
DialysisIrrigation: solution.DialysisIrrigation,
|
858
|
858
|
DialysisDialyszers: solution.DialysisDialyszers,
|
|
859
|
+ PlasmaSeparator: solution.PlasmaSeparator,
|
859
|
860
|
}
|
860
|
861
|
service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
|
861
|
862
|
if err != nil {
|
|
@@ -3410,6 +3411,11 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
|
3410
|
3411
|
solution.DialysisIrrigation = dialysisIrrigation
|
3411
|
3412
|
}
|
3412
|
3413
|
|
|
3414
|
+ if dataBody["plasma_separator"] != nil && reflect.TypeOf(dataBody["plasma_separator"]).String() == "string" {
|
|
3415
|
+ plasmaSeparator := dataBody["plasma_separator"].(string)
|
|
3416
|
+ solution.PlasmaSeparator = plasmaSeparator
|
|
3417
|
+ }
|
|
3418
|
+
|
3413
|
3419
|
return
|
3414
|
3420
|
}
|
3415
|
3421
|
|