csx 4 年前
父节点
当前提交
1e50f85bb7
共有 3 个文件被更改,包括 14 次插入3 次删除
  1. 9 3
      controllers/his_api_controller.go
  2. 1 0
      models/his_models.go
  3. 4 0
      service/his_service.go

+ 9 - 3
controllers/his_api_controller.go 查看文件

1009
 	found_price, _ := c.GetFloat("found_price")
1009
 	found_price, _ := c.GetFloat("found_price")
1010
 	medical_insurance_price, _ := c.GetFloat("medical_insurance_price")
1010
 	medical_insurance_price, _ := c.GetFloat("medical_insurance_price")
1011
 	private_price, _ := c.GetFloat("private_price")
1011
 	private_price, _ := c.GetFloat("private_price")
1012
-
1013
 	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
1012
 	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
1014
-	//admin_user_id, _ := c.GetInt64("admin_user_id")
1013
+	admin_user_id, _ := c.GetInt64("admin_user_id")
1015
 
1014
 
1016
 	timeLayout := "2006-01-02"
1015
 	timeLayout := "2006-01-02"
1017
 	loc, _ := time.LoadLocation("Local")
1016
 	loc, _ := time.LoadLocation("Local")
1056
 		data["pre"] = prescriptions
1055
 		data["pre"] = prescriptions
1057
 
1056
 
1058
 	}
1057
 	}
1058
+
1059
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
1060
+
1059
 	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
1061
 	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
1060
 	timestamp := time.Now().Unix()
1062
 	timestamp := time.Now().Unix()
1061
 	tempTime := time.Unix(timestamp, 0)
1063
 	tempTime := time.Unix(timestamp, 0)
1142
 				SettleType:            settle_accounts_type,
1144
 				SettleType:            settle_accounts_type,
1143
 				SettleStartTime:       start_time,
1145
 				SettleStartTime:       start_time,
1144
 				SettleEndTime:         end_time,
1146
 				SettleEndTime:         end_time,
1147
+				Creator:               roles.ID,
1148
+				Modify:                roles.ID,
1145
 			}
1149
 			}
1146
 			err = service.CreateOrder(order)
1150
 			err = service.CreateOrder(order)
1147
 			if err != nil {
1151
 			if err != nil {
1331
 					order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
1335
 					order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
1332
 					order.ClrOptins = res.Output.Setlinfo.ClrOptins
1336
 					order.ClrOptins = res.Output.Setlinfo.ClrOptins
1333
 					order.ClrWay = res.Output.Setlinfo.ClrWay
1337
 					order.ClrWay = res.Output.Setlinfo.ClrWay
1338
+					order.Creator = order.Creator
1339
+					order.Modify = roles.ID
1334
 					setlDetail, _ := json.Marshal(res.Output.Setldetail)
1340
 					setlDetail, _ := json.Marshal(res.Output.Setldetail)
1335
 					detailStr := string(setlDetail)
1341
 					detailStr := string(setlDetail)
1336
 					order.SetlDetail = detailStr
1342
 					order.SetlDetail = detailStr
1642
 		//	return
1648
 		//	return
1643
 		//}
1649
 		//}
1644
 		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
1650
 		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
1645
-		service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
1651
+		//service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
1646
 
1652
 
1647
 		if err == nil {
1653
 		if err == nil {
1648
 			c.ServeSuccessJSON(map[string]interface{}{
1654
 			c.ServeSuccessJSON(map[string]interface{}{

+ 1 - 0
models/his_models.go 查看文件

649
 	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
649
 	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
650
 	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
650
 	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
651
 	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
651
 	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
652
+	Modify                int64     `gorm:"column:modify" json:"modify" form:"modify"`
652
 
653
 
653
 	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
654
 	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
654
 	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`
655
 	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`

+ 4 - 0
service/his_service.go 查看文件

545
 	FoundPrice            float64 `gorm:"column:found_price" json:"found_price" form:"found_price"`
545
 	FoundPrice            float64 `gorm:"column:found_price" json:"found_price" form:"found_price"`
546
 	MedicalInsurancePrice float64 `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
546
 	MedicalInsurancePrice float64 `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
547
 	PrivatePrice          float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
547
 	PrivatePrice          float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
548
+	Creator               int64   `gorm:"column:creator" json:"creator" form:"creator"`
549
+	Modify                int64   `gorm:"column:modify" json:"modify" form:"modify"`
548
 
550
 
549
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
551
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
550
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
552
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
731
 	Status             int64  `gorm:"column:status" json:"status" form:"status"`
733
 	Status             int64  `gorm:"column:status" json:"status" form:"status"`
732
 	Number             string `gorm:"column:number" json:"number" form:"number"`
734
 	Number             string `gorm:"column:number" json:"number" form:"number"`
733
 	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
735
 	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
736
+	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
737
+	Modify             int64  `gorm:"column:modify" json:"modify" form:"modify"`
734
 
738
 
735
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
739
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
736
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
740
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`