1

controllers/his_api_controller.go

@@ -94,8 +94,27 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/changemedtype/post", &HisApiController{}, "post:ChangeMedType")
 
+	beego.Router("/api/refunddetail/post", &HisApiController{}, "post:RefudDetail")
+	
+
+}
+
+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
+	}
 }
 
+
 func (c *HisApiController) Sscard() {
 	//r := CardInit()
 	//if r == 0 {
@@ -2778,12 +2797,16 @@ func (c *HisApiController) GetUploadInfo() {
 	var start_time int64
 	var end_time int64
 
-	if tempOrder.ID == 0 {
 
+	ids_str := c.GetString("ids")
+ 	ids_arr := strings.Split(ids_str,  ",")
+	if tempOrder.ID == 0 {
 		if settle_accounts_type == 1 { //日结
-
-			prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
-
+			if reg_type == 11{
+				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")
@@ -4418,6 +4441,7 @@ 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")
@@ -4438,10 +4462,21 @@ func (c *HisApiController) PreSettle() {
 	var start_time int64
 	var end_time int64
 
+	ids_str := c.GetString("ids")
+	ids_arr := strings.Split(ids_str,  ",")
+
+
+
 	if settle_accounts_type == 1 { //日结
 
-		prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
+		if reg_type == 11{
+
+			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")

service/his_service.go

@@ -2045,3 +2045,9 @@ func SaveHisOrder(his *models.HisOrder) (err error) {
 	err = writeDb.Save(&his).Error
 	return
 }
+
+
+func GetPrescriptionByIds(ids []string, org_id int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).Where("id in (?) AND user_org_id = ? AND status = 1", ids, org_id).Find(&prescription).Error
+	return
+}