Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/his_api_controller.go

 		advice.IsSelfDrug = is_self_drug
 	}
 
+	if json["drug_way_count"] != nil && reflect.TypeOf(json["drug_way_count"]).String() == "string" {
+		//drug_way_count, _ := strconv.ParseInt(json["drug_way_count"].(string), 10, 64)
+		drug_way_count, _ := json["drug_way_count"].(string)
+		advice.DrugWayCount = drug_way_count
+	}
+
 	if json["min_unit"] != nil && reflect.TypeOf(json["min_unit"]).String() == "string" {
 		drugSpecUnit, _ := json["min_unit"].(string)
 		advice.DrugSpecUnit = drugSpecUnit
 		is_self_drug, _ := strconv.ParseInt(json["is_self_drug"].(string), 10, 64)
 		advice.IsSelfDrug = is_self_drug
 	}
+	if json["drug_way_count"] != nil && reflect.TypeOf(json["drug_way_count"]).String() == "string" {
+		//drug_way_count, _ := strconv.ParseInt(json["drug_way_count"].(string), 10, 64)
+		drug_way_count, _ := json["drug_way_count"].(string)
+		advice.DrugWayCount = drug_way_count
+	}
 
 	if json["hosp_appr_flag"] != nil && reflect.TypeOf(json["hosp_appr_flag"]).String() == "string" {
 		hosp_appr_flag, _ := strconv.ParseInt(json["hosp_appr_flag"].(string), 10, 64)

models/his_models.go

 	IsSettle              int64                  `gorm:"column:is_settle" json:"is_settle" form:"is_settle"`
 	IsMobile              int64                  `gorm:"column:is_mobile" json:"is_mobile" form:"is_mobile"`
 	IsSelfDrug            int64                  `gorm:"column:is_self_drug" json:"is_self_drug" form:"is_self_drug"`
+	DrugWayCount          string                 `gorm:"column:drug_way_count" json:"drug_way_count" form:"drug_way_count"`
 }
 
 func (HisDoctorAdviceInfo) TableName() string {

service/his_service.go

 	return
 }
 
+func UpdataOrderStatusten(id int64, number string, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 3, "mtime": time.Now().Unix(), "status": 0}).Error
+	//err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
+	return
+}
+
 func UpdataHospitalOrderStatus(id int64, number string, user_org_id int64, log string, result string) (err error) {
 	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix(), "refund_request_log": log, "refund_log": result, "status": 1}).Error
 	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 4, "mtime": time.Now().Unix()}).Error
 	return
 }
 
+func UpdataOrderStatusTen(id int64, number string, user_org_id int64) (err error) {
+	err = writeDb.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 1, "mtime": time.Now().Unix()}).Error
+	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 1, "mtime": time.Now().Unix()}).Error
+	return
+}
+
 func UpdataOrderInfoStatus(id int64, number string, user_org_id int64) {
 	err = writeDb.Model(&models.HisOrder{}).Where("status = 1 AND id = ? AND user_org_id = ?", id, user_org_id).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error
 	err = writeDb.Model(&models.HisOrderInfo{}).Where("status = 1 AND user_org_id = ? AND order_number = ?", user_org_id, number).Updates(map[string]interface{}{"mtime": time.Now().Unix(), "status": 0}).Error