XMLWAN před 4 roky
rodič
revize
60cda2bc41

+ 13 - 0
controllers/his_api_controller.go Zobrazit soubor

1352
 			Idetinfo:    idetinfoStr,
1352
 			Idetinfo:    idetinfoStr,
1353
 			PatientId:   patient.ID,
1353
 			PatientId:   patient.ID,
1354
 			RecordDate:  theTime.Unix(),
1354
 			RecordDate:  theTime.Unix(),
1355
+			UserOrgId:   adminInfo.CurrentOrgId,
1356
+			AdminUserId: adminInfo.AdminUser.Id,
1357
+			IsReturn:    1,
1355
 		}
1358
 		}
1356
 		fmt.Println(his)
1359
 		fmt.Println(his)
1357
 
1360
 
1361
+		lastPatient, _ := service.GetLastPatient(adminInfo.CurrentOrgId)
1362
+		timeStr := time.Now().Format("2006-01-02")
1363
+		timeArr := strings.Split(timeStr, "-")
1364
+		var str = timeArr[0] + timeArr[1] + timeArr[2] + strconv.FormatInt(lastPatient.ID, 10)
1365
+
1366
+		hisPatient := models.HisPatient{
1367
+			Number: str,
1368
+		}
1369
+		err = service.UpdateHisPatient(lastPatient.ID, hisPatient)
1370
+
1358
 		if res.Output.Iinfo == nil || len(res.Output.Iinfo) == 0 {
1371
 		if res.Output.Iinfo == nil || len(res.Output.Iinfo) == 0 {
1359
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterOneException)
1372
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRegisterOneException)
1360
 			return
1373
 			return

+ 1 - 1
models/his_models.go Zobrazit soubor

317
 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
317
 	HisDoctorAdviceInfo    []*HisDoctorAdviceInfo    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"advices"`
318
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
318
 	HisPrescriptionProject []*HisPrescriptionProject `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"project"`
319
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
319
 	HisAdditionalCharge    []*HisAdditionalCharge    `gorm:"ForeignKey:PrescriptionId;AssociationForeignKey:ID" json:"addition"`
320
-	//VMHisPrescriptionInfo  VMHisPrescriptionInfo     `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
320
+	VMHisPrescriptionInfo  HisPrescriptionInfo       `gorm:"ForeignKey:PatientId,RecordDate;AssociationForeignKey:PatientId,ScheduleDate" json:"info"`
321
 }
321
 }
322
 
322
 
323
 func (HisPrescription) TableName() string {
323
 func (HisPrescription) TableName() string {

+ 1 - 1
service/his_project_service.go Zobrazit soubor

389
 
389
 
390
 func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string, orgid int64) (prescription []*models.HisPrescription, err error) {
390
 func GetDoctorAdvicePrint(his_patient_id int64, recorddate int64, schIDs []string, orgid int64) (prescription []*models.HisPrescription, err error) {
391
 
391
 
392
-	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", "status = 1 and user_org_id = ?", orgid).Preload("HisPrescriptionProject", "status = 1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
392
+	err = XTReadDB().Model(&prescription).Where("patient_id = ? and record_date = ? and id in(?) and  status = 1 ", his_patient_id, recorddate, schIDs).Preload("Patients", "status = 1 and user_org_id = ?", orgid).Preload("HisDoctorAdviceInfo", "status = 1 and user_org_id = ?", orgid).Preload("HisPrescriptionProject", "status = 1 and user_org_id = ?", orgid).Preload("VMHisPrescriptionInfo", "status =1 and user_org_id = ?", orgid).Preload("XtHisAdditionalCharge", "status = 1 and user_org_id = ?", orgid).Find(&prescription).Error
393
 
393
 
394
 	return prescription, err
394
 	return prescription, err
395
 }
395
 }