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

controllers/his_api_controller.go

@@ -95,7 +95,6 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/changemedtype/post", &HisApiController{}, "post:ChangeMedType")
 
 	beego.Router("/api/refunddetail/post", &HisApiController{}, "post:RefudDetail")
-	
 
 }
 
@@ -103,18 +102,12 @@ func (c *HisApiController) RefudDetail() {
 	order_id, _ := c.GetInt64("order_id")
 	order, _ := service.GetHisOrderByID(order_id)
 	adminUser := c.GetAdminUserInfo()
-	err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId)
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "撤销成功",
-		})
-	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
+	service.UpdataOrderInfoStatus(order_id, order.Number, adminUser.CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "撤销成功",
+	})
 }
 
-
 func (c *HisApiController) Sscard() {
 	//r := CardInit()
 	//if r == 0 {
@@ -2797,18 +2790,17 @@ func (c *HisApiController) GetUploadInfo() {
 	var start_time int64
 	var end_time int64
 
-
 	ids_str := c.GetString("ids")
- 	ids_arr := strings.Split(ids_str,  ",")
+	ids_arr := strings.Split(ids_str, ",")
 	if tempOrder.ID == 0 {
 		if settle_accounts_type == 1 { //日结
 			fmt.Println(reg_type)
-			if reg_type == 11{
+			if reg_type == 11 {
 				fmt.Println(reg_type)
-				prescriptions,_ = service.GetPrescriptionByIds(ids_arr,adminUser.CurrentOrgId)
-			   }else{
+				prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
+			} else {
 				prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
-			   }
+			}
 		} else { //月结
 			start_time_str := c.GetString("start_time")
 			end_time_str := c.GetString("end_time")
@@ -4444,7 +4436,6 @@ func (c *HisApiController) PreSettle() {
 	record_time := c.GetString("record_time")
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 
-	
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	settle_accounts_type, _ := c.GetInt64("settle_accounts_type")
@@ -4466,16 +4457,16 @@ func (c *HisApiController) PreSettle() {
 	var end_time int64
 
 	ids_str := c.GetString("ids")
-	ids_arr := strings.Split(ids_str,  ",")
+	ids_arr := strings.Split(ids_str, ",")
 
 	fmt.Println(reg_type)
 
 	if settle_accounts_type == 1 { //日结
 
-		if reg_type == 11{
+		if reg_type == 11 {
 
-			prescriptions,_ = service.GetPrescriptionByIds(ids_arr,adminUser.CurrentOrgId)
-		}else{
+			prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
+		} else {
 			prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
 		}
 

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	_ "XT_New/routers"
 	"XT_New/service"
-
 	"github.com/astaxie/beego"
 )
 
@@ -17,7 +16,6 @@ func main() {
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()
 	//service.BeginAutoCreateStaffScheduleJob()
-	//service.BeginAutoCreateDrugJob()
-	//service.BeginAutoCreateStockJob()
+	beego.BConfig.WebConfig.Session.SessionGCMaxLifetime = 60
 	beego.Run()
 }

service/his_hospital_service.go

@@ -116,7 +116,7 @@ func (VMHospitalPatient) TableName() string {
 //	offset := (page - 1) * limit
 //	db := readDb.Model(&VMHospitalPatient{}).Where("user_org_id = ? AND status = 1", org_id)
 //	if len(keywords) > 0 {
-//		keywords = "%" + keywords + "%"
+//	wkkk	keywords = "%" + keywords + "%"
 //		db = db.Joins("JOIN xt_patients as p On xt_schedule.patient_id = p.id AND p.user_org_id = ? AND p.name like ?", org_id, keywords)
 //		db = db.Joins("JOIN his_prescription_info as info On xt_schedule.patient_id = info.patient_id  AND info.user_org_id = ? AND  info.record_date = ? AND info.prescription_number like ? AND info.p_type == 1", org_id, record_date, keywords)
 //	}

service/his_project_service.go

@@ -612,8 +612,6 @@ func GetPrescriptionByPatientId(patient_id int64, startime int64, p_type int64)
 	return
 }
 
-
-
 // func GetPrescriptionByPatientId(patient_id int64, startime int64, p_type int64) (prescritpion []*models.HisPrescription, err error) {
 // // 	err = XTReadDB().Model(&prescritpion).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 // // 		return db.Where("status = 1 and user_org_id = ?", orgid).Preload("Drug", "status = 1")

service/his_service.go

@@ -1027,6 +1027,14 @@ func UpdataOrderStatus(id int64, number string, user_org_id int64) (err error) {
 
 }
 
+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
+
+	return
+
+}
+
 func SaveHisPatient(his models.HisPatient) (err error) {
 	err = writeDb.Save(&his).Error
 	return
@@ -1783,7 +1791,7 @@ func GetNewAllUnChargeHisPatientList(org_id int64, keywords string, record_date
 	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrders", "user_org_id = ? AND status = 1 AND settle_accounts_date = ?", org_id, record_date)
 	})
-	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND order_status <> 2", org_id, record_date)
+	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND order_status <> 2 AND order_status <> 3", org_id, record_date)
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1 AND prescription_status <> 3", org_id, record_date).Find(&patients).Error
 
 	for _, item := range patients {
@@ -1801,7 +1809,7 @@ func GetNewAllUnChargeHisPatientList(org_id int64, keywords string, record_date
 func GetNewAllChargeHisPatientList(org_id int64, keywords string, record_date int64) (patients []*NewTempPatients, err error) {
 	db := readDb.Model(&NewTempPatients{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
 	db = db.Preload("HisPatient", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrders", "user_org_id = ? AND status = 1 AND settle_accounts_date = ?", org_id, record_date)
+		return db.Where("status = 1 AND user_org_id = ? AND record_date = ?", org_id, record_date).Preload("VMHisOrders", "user_org_id = ? AND status = 1 AND settle_accounts_date = ? ", org_id, record_date)
 	})
 	db = db.Preload("HisPrescription", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date)
 	err = db.Preload("VMHisPrescriptionInfo", "user_org_id = ? AND status = 1 AND record_date = ? AND p_type <> 1", org_id, record_date).Find(&patients).Error
@@ -2046,7 +2054,6 @@ func SaveHisOrder(his *models.HisOrder) (err error) {
 	return
 }
 
-
 func GetPrescriptionByIds(ids []string, org_id int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
 		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
@@ -2060,8 +2067,8 @@ func GetPrescriptionByIds(ids []string, org_id int64) (prescription []*models.Hi
 		}).Preload("TempHisOrder", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 AND user_org_id = ?", org_id)
 	}).
-		Where("id in (?) AND user_org_id = ? AND status = 1", ids,org_id).
+		Where("id in (?) AND user_org_id = ? AND status = 1", ids, org_id).
 		Find(&prescription).Error
-	
+
 	return
 }