1111

controllers/his_api_controller.go

@@ -1009,9 +1009,8 @@ func (c *HisApiController) GetUploadInfo() {
 	found_price, _ := c.GetFloat("found_price")
 	medical_insurance_price, _ := c.GetFloat("medical_insurance_price")
 	private_price, _ := c.GetFloat("private_price")
-
 	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
-	//admin_user_id, _ := c.GetInt64("admin_user_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -1056,6 +1055,9 @@ func (c *HisApiController) GetUploadInfo() {
 		data["pre"] = prescriptions
 
 	}
+
+	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+
 	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, id, recordDateTime)
 	timestamp := time.Now().Unix()
 	tempTime := time.Unix(timestamp, 0)
@@ -1142,6 +1144,8 @@ func (c *HisApiController) GetUploadInfo() {
 				SettleType:            settle_accounts_type,
 				SettleStartTime:       start_time,
 				SettleEndTime:         end_time,
+				Creator:               roles.ID,
+				Modify:                roles.ID,
 			}
 			err = service.CreateOrder(order)
 			if err != nil {
@@ -1331,6 +1335,8 @@ func (c *HisApiController) GetUploadInfo() {
 					order.MedinsSetlId = res.Output.Setlinfo.MedinsSetlID
 					order.ClrOptins = res.Output.Setlinfo.ClrOptins
 					order.ClrWay = res.Output.Setlinfo.ClrWay
+					order.Creator = order.Creator
+					order.Modify = roles.ID
 					setlDetail, _ := json.Marshal(res.Output.Setldetail)
 					detailStr := string(setlDetail)
 					order.SetlDetail = detailStr
@@ -1642,7 +1648,7 @@ func (c *HisApiController) Refund() {
 		//	return
 		//}
 		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
-		service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
+		//service.UpdataRegStatus(patient_id, recordDateTime, adminUser.CurrentOrgId)
 
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{

models/his_models.go

@@ -649,6 +649,7 @@ type HisOrder struct {
 	MedicalInsurancePrice float64   `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
 	PrivatePrice          float64   `gorm:"column:private_price" json:"private_price" form:"private_price"`
 	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                int64     `gorm:"column:modify" json:"modify" form:"modify"`
 
 	SettleType      int64 `gorm:"column:settle_type" json:"settle_type" form:"settle_type"`
 	SettleStartTime int64 `gorm:"column:settle_start_time" json:"settle_start_time" form:"settle_start_time"`

service/his_service.go

@@ -545,6 +545,8 @@ type HisOrder struct {
 	FoundPrice            float64 `gorm:"column:found_price" json:"found_price" form:"found_price"`
 	MedicalInsurancePrice float64 `gorm:"column:medical_insurance_price" json:"medical_insurance_price" form:"medical_insurance_price"`
 	PrivatePrice          float64 `gorm:"column:private_price" json:"private_price" form:"private_price"`
+	Creator               int64   `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify                int64   `gorm:"column:modify" json:"modify" form:"modify"`
 
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`
@@ -731,6 +733,8 @@ type XtHisOrder struct {
 	Status             int64  `gorm:"column:status" json:"status" form:"status"`
 	Number             string `gorm:"column:number" json:"number" form:"number"`
 	PatientId          int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Creator            int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Modify             int64  `gorm:"column:modify" json:"modify" form:"modify"`
 
 	HisOrderInfo        models.HisOrderInfo        `gorm:"ForeignKey:ID;AssociationForeignKey:OrderId" json:"order_info"`
 	Patients            models.Patients            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"patient"`