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

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9529
 runmode = dev
 
 #

controllers/dialysis_record_api_controller.go

@@ -77,7 +77,7 @@ func (this *DialysisRecordAPIController) GetSchedules() {
 	redis := service.RedisClient()
 	defer redis.Close()
 	key := "scheduals_" + schedualDate + "_" + strconv.FormatInt(orgID, 10)
-	patients, _ := service.GetAllPcPatientListByListSeven(orgID)
+	patients, _ := service.GetAllPcPatientListByListEight(orgID)
 	scheduals_json_str, _ := redis.Get(key).Result()
 
 	if len(scheduals_json_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -277,6 +277,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	go func() {
 		doctorAdvices, _ = service.MobileGetDoctorAdvices(adminInfo.CurrentOrgId, patientID, date.Unix())
+
 		ch <- struct{}{}
 	}()
 
@@ -388,13 +389,6 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 
 	dialysisSolution, _ := service.GetDialysisSolution(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
 
-	//
-	//if getDialysisSolutionErr != nil {
-	//	this.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-	//	return
-	//}
-
 	lastDialysisPrescribe, _ := service.GetLastDialysisPrescribeByModeId(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
 
 	systemDialysisPrescribe, _ := service.GetSystemDialysisPrescribeByModeId(adminInfo.CurrentOrgId, schedual.ModeId)
@@ -409,10 +403,15 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 	headNurses, _ := service.GetAllSpecialPermissionAdminUsersWithoutStatus(adminInfo.CurrentOrgId, adminInfo.CurrentAppId, models.SpecialPermissionTypeHeadNurse)
 
 	var his_advices []*models.HisDoctorAdviceInfo
-	fmt.Println("hhh2333223322323223", is_open_config.IsOpen)
+
 	if is_open_config.IsOpen == 1 {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
 	}
+	//查询是否是开起
+	adviceConfig, _ := service.FindAdviceSettingById(adminInfo.CurrentOrgId)
+	if adviceConfig.IsAdviceOpen == 1 {
+		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.CurrentOrgId, patientID, date.Unix())
+	}
 
 	_, errcode := service.GetOrgFollowIsExist(adminInfo.CurrentOrgId)
 	if errcode == gorm.ErrRecordNotFound {
@@ -447,6 +446,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"prepare":                     prepare,
 			"lastAssessment":              lastAssessment,
 			"information":                 information,
+			"is_advice_open":              adviceConfig,
 		}
 		this.ServeSuccessJSON(returnData)
 
@@ -482,6 +482,7 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 			"prepare":                     prepare,
 			"lastAssessment":              lastAssessment,
 			"information":                 information,
+			"is_advice_open":              adviceConfig,
 		}
 		this.ServeSuccessJSON(returnData)
 	}

controllers/his_api_controller.go

@@ -1869,16 +1869,17 @@ func (c *HisApiController) DeletePrescription() {
 					total, _ := service.FindAllCancelStockTotal(c.GetAdminUserInfo().CurrentOrgId)
 					total = total + 1
 					orderNumber := "CKTKD" + strconv.FormatInt(c.GetAdminUserInfo().CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-
+					houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 					cancelStock := models.CancelStock{
-						OrderNumber: orderNumber,
-						OperaTime:   operation_time,
-						OrgId:       c.GetAdminUserInfo().CurrentOrgId,
-						Creater:     creater,
-						Ctime:       time.Now().Unix(),
-						Status:      1,
-						ReturnTime:  item.RecordDate,
-						Type:        1,
+						OrderNumber:  orderNumber,
+						OperaTime:    operation_time,
+						OrgId:        c.GetAdminUserInfo().CurrentOrgId,
+						Creater:      creater,
+						Ctime:        time.Now().Unix(),
+						Status:       1,
+						ReturnTime:   item.RecordDate,
+						Type:         1,
+						StorehouseId: houseConfig.StorehouseOutInfo,
 					}
 					_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(item.RecordDate, c.GetAdminUserInfo().CurrentOrgId)
 					if msgerrkonde == gorm.ErrRecordNotFound {
@@ -1914,6 +1915,7 @@ func (c *HisApiController) DeletePrescription() {
 							WarehouseInfoId: info.WarehouseInfotId,
 							PatientId:       info.PatientId,
 							RecordDate:      info.SysRecordTime,
+							StorehouseId:    houseConfig.StorehouseOutInfo,
 						}
 
 						service.CreateCancelStockInfoOne(&cancelStockInfo)
@@ -1950,6 +1952,7 @@ func (c *HisApiController) DeletePrescription() {
 							CancelOutDetailId:       cancelInfo.ID,
 							ProductDate:             info.ProductDate,
 							ExpireDate:              info.ExpiryDate,
+							StorehouseId:            houseConfig.StorehouseOutInfo,
 						}
 						service.CreateStockFlowOne(flow)
 
@@ -2002,6 +2005,7 @@ func (c *HisApiController) DeletePrescription() {
 									Manufacturer:            0,
 									Type:                    1,
 									IsSys:                   1,
+									StorehouseId:            houseConfig.StorehouseOutInfo,
 								}
 								err := service.AddSigleWarehouseOut(&warehouseOut)
 								if err != nil {
@@ -2009,24 +2013,26 @@ func (c *HisApiController) DeletePrescription() {
 									return
 								}
 								prepare := &models.DialysisBeforePrepare{
-									UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-									PatientId:  info.PatientId,
-									RecordDate: info.SysRecordTime,
-									GoodId:     item.ProjectId,
-									GoodTypeId: info.GoodTypeId,
-									Count:      cha_count,
+									UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+									PatientId:    info.PatientId,
+									RecordDate:   info.SysRecordTime,
+									GoodId:       item.ProjectId,
+									GoodTypeId:   info.GoodTypeId,
+									Count:        cha_count,
+									StorehouseId: houseConfig.StorehouseOutInfo,
 								}
 								//出库
 								service.ConsumablesDelivery(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &warehouseOut, cha_count)
 							} else if err == nil {
 
 								prepare := &models.DialysisBeforePrepare{
-									UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
-									PatientId:  info.PatientId,
-									RecordDate: info.SysRecordTime,
-									GoodId:     item.ProjectId,
-									GoodTypeId: info.GoodTypeId,
-									Count:      cha_count,
+									UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
+									PatientId:    info.PatientId,
+									RecordDate:   info.SysRecordTime,
+									GoodId:       item.ProjectId,
+									GoodTypeId:   info.GoodTypeId,
+									Count:        cha_count,
+									StorehouseId: houseConfig.StorehouseOutInfo,
 								}
 								//出库
 								service.ConsumablesDelivery(c.GetAdminUserInfo().CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &out, cha_count)
@@ -2087,7 +2093,7 @@ func (c *HisApiController) DeletePrescription() {
 						total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
 						total = total + 1
 						orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-
+						houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 						cancelStock := models.DrugCancelStock{
 							OrderNumber:  orderNumber,
 							OperaTime:    operation_time,
@@ -2099,6 +2105,7 @@ func (c *HisApiController) DeletePrescription() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2127,6 +2134,7 @@ func (c *HisApiController) DeletePrescription() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2162,6 +2170,7 @@ func (c *HisApiController) DeletePrescription() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2171,6 +2180,7 @@ func (c *HisApiController) DeletePrescription() {
 						//删除流水
 						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, item.ID)
 					} else {
+						houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 						floatPrescrip := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 32)
 
 						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
@@ -2205,6 +2215,7 @@ func (c *HisApiController) DeletePrescription() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2234,6 +2245,7 @@ func (c *HisApiController) DeletePrescription() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2270,6 +2282,7 @@ func (c *HisApiController) DeletePrescription() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2350,7 +2363,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 						total, _ := service.FindAllDrugCancelStockTotal(adminUserInfo.CurrentOrgId)
 						total = total + 1
 						orderNumber := "CKTKD" + strconv.FormatInt(adminUserInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
-
+						houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 						cancelStock := models.DrugCancelStock{
 							OrderNumber:  orderNumber,
 							OperaTime:    operation_time,
@@ -2362,6 +2375,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2390,6 +2404,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2425,6 +2440,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2434,7 +2450,8 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 						//删除流水
 						service.UpdateDrugFlowTens(info.PatientId, info.WarehouseOutOrderNumber, info.DrugId, advice.ID)
 					} else {
-
+						adminUserInfo := c.GetAdminUserInfo()
+						houseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.CurrentOrgId)
 						floatPrescrip := strconv.FormatFloat(advice.PrescribingNumber, 'f', -1, 32)
 
 						prescribingNumber, _ := strconv.ParseInt(floatPrescrip, 10, 64)
@@ -2447,7 +2464,6 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 
 						}
 
-						adminUserInfo := c.GetAdminUserInfo()
 						operation_time := time.Now().Unix()
 						creater := adminUserInfo.AdminUser.Id
 
@@ -2469,6 +2485,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							Dealer:       info.Dealer,
 							Manufacturer: info.Manufacturer,
 							Type:         1,
+							StorehouseId: houseConfig.DrugStorehouseOut,
 						}
 						service.AddSigleDrugCancelStock(&cancelStock)
 
@@ -2497,6 +2514,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							ProductDate:      info.ProductDate,
 							ExpiryDate:       info.ExpiryDate,
 							BatchNumberId:    info.WarehouseInfoId,
+							StorehouseId:     houseConfig.DrugStorehouseOut,
 						}
 
 						flow := models.DrugFlow{
@@ -2532,6 +2550,7 @@ func (c *HisApiController) DeleteDoctorAdvice() {
 							MaxUnit:                 info.CountUnit,
 							MinUnit:                 "",
 							AdviceId:                info.AdviceId,
+							StorehouseId:            houseConfig.DrugStorehouseOut,
 						}
 						service.CreatedCancelStock(cancelStockInfo)
 						service.CreateDrugFlowOne(flow)
@@ -2574,6 +2593,7 @@ func (c *HisApiController) DeleteProject() {
 			fmt.Println(err)
 		}
 		if project.Type == 3 {
+			houseConfig, _ := service.GetAllStoreHouseConfig(c.GetAdminUserInfo().CurrentOrgId)
 			good, _ := service.FindGoodInfoByIdTwo(project.ProjectId)
 			f_count, _ := strconv.ParseFloat(project.Count, 64)
 			good.Total = good.Total + f_count
@@ -2589,14 +2609,15 @@ func (c *HisApiController) DeleteProject() {
 			orderNumber := "CKTKD" + strconv.FormatInt(adminInfo.CurrentOrgId, 10) + timeArr[0] + timeArr[1] + timeArr[2] + "000" + strconv.FormatInt(total, 10)
 
 			cancelStock := models.CancelStock{
-				OrderNumber: orderNumber,
-				OperaTime:   operation_time,
-				OrgId:       adminInfo.CurrentOrgId,
-				Creater:     creater,
-				Ctime:       time.Now().Unix(),
-				Status:      1,
-				ReturnTime:  project.RecordDate,
-				Type:        1,
+				OrderNumber:  orderNumber,
+				OperaTime:    operation_time,
+				OrgId:        adminInfo.CurrentOrgId,
+				Creater:      creater,
+				Ctime:        time.Now().Unix(),
+				Status:       1,
+				ReturnTime:   project.RecordDate,
+				Type:         1,
+				StorehouseId: houseConfig.StorehouseOutInfo,
 			}
 			_, msgerrkonde := service.GetCancelStockDetailByOrderNumberOne(project.RecordDate, adminInfo.CurrentOrgId)
 			if msgerrkonde == gorm.ErrRecordNotFound {
@@ -2633,6 +2654,7 @@ func (c *HisApiController) DeleteProject() {
 					WarehouseInfoId: info.WarehouseInfotId,
 					PatientId:       info.PatientId,
 					RecordDate:      info.SysRecordTime,
+					StorehouseId:    houseConfig.StorehouseOutInfo,
 				}
 
 				service.CreateCancelStockInfoOne(&cancelStockInfo)
@@ -2669,6 +2691,7 @@ func (c *HisApiController) DeleteProject() {
 					CancelOutDetailId:       cancelInfo.ID,
 					ProductDate:             info.ProductDate,
 					ExpireDate:              info.ExpiryDate,
+					StorehouseId:            houseConfig.StorehouseOutInfo,
 				}
 				service.CreateStockFlowOne(flow)
 
@@ -2721,6 +2744,7 @@ func (c *HisApiController) DeleteProject() {
 							Manufacturer:            0,
 							Type:                    1,
 							IsSys:                   1,
+							StorehouseId:            houseConfig.StorehouseOutInfo,
 						}
 						err := service.AddSigleWarehouseOut(&warehouseOut)
 						if err != nil {
@@ -2728,23 +2752,25 @@ func (c *HisApiController) DeleteProject() {
 							return
 						}
 						prepare := &models.DialysisBeforePrepare{
-							UserOrgId:  adminInfo.CurrentOrgId,
-							PatientId:  info.PatientId,
-							RecordDate: info.SysRecordTime,
-							GoodId:     project.ProjectId,
-							GoodTypeId: info.GoodTypeId,
-							Count:      cha_count,
+							UserOrgId:    adminInfo.CurrentOrgId,
+							PatientId:    info.PatientId,
+							RecordDate:   info.SysRecordTime,
+							GoodId:       project.ProjectId,
+							GoodTypeId:   info.GoodTypeId,
+							Count:        cha_count,
+							StorehouseId: houseConfig.StorehouseOutInfo,
 						}
 						//出库
 						service.ConsumablesDelivery(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &warehouseOut, cha_count)
 					} else if err == nil {
 						prepare := &models.DialysisBeforePrepare{
-							UserOrgId:  adminInfo.CurrentOrgId,
-							PatientId:  info.PatientId,
-							RecordDate: info.SysRecordTime,
-							GoodId:     project.ProjectId,
-							GoodTypeId: info.GoodTypeId,
-							Count:      cha_count,
+							UserOrgId:    adminInfo.CurrentOrgId,
+							PatientId:    info.PatientId,
+							RecordDate:   info.SysRecordTime,
+							GoodId:       project.ProjectId,
+							GoodTypeId:   info.GoodTypeId,
+							Count:        cha_count,
+							StorehouseId: houseConfig.StorehouseOutInfo,
 						}
 						//出库
 						service.ConsumablesDelivery(adminInfo.CurrentOrgId, info.PatientId, info.SysRecordTime, prepare, &out, cha_count)
@@ -4521,9 +4547,40 @@ func (c *HisApiController) GetUploadInfo() {
 	reg_type, _ := c.GetInt64("p_type")
 	order_id, _ := c.GetInt64("order_id")
 
-	his, _ := service.GetHisPatientByIdThree(his_patient_id)
+	dec_way := c.GetString("dec_way") //是否使用押金支付bool类型
+	tmp_decimal := c.GetString("tmp_decimal")
+	var decimal float64 //本次使用的押金
+	var errmsg error
+	tx := service.XTWriteDB().Begin() //开了事务
+	//只检测扣费函数SpendDeposit有没有返回错误，如果有则回滚所有以TX结尾的方法（去掉TX即为原先的方法）
+	defer func() {
+		if errmsg != nil {
+			utils.ErrorLog("事务失败,原因为: %v", errmsg.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	if dec_way == "true" && tmp_decimal == "0" && tmp_decimal == "" {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金不能为0")
+		return
+	}
+	if len(tmp_decimal) > 0 {
+		if tmp_decimal[0] == 45 {
+			c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金不能为负数")
+			return
+		}
+	}
+	tt, errs := strconv.ParseFloat(tmp_decimal, 64)
+	if errs != nil {
+		c.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金金额错误")
+		return
+	}
+	decimal = tt
 
-	tempOrder, _ := service.GetHisOrderByID(order_id)
+	his, _ := service.GetHisPatientByIdThreeTX(his_patient_id, tx)
+
+	tempOrder, _ := service.GetHisOrderByIDTX(order_id, tx)
 
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
 	if err != nil {
@@ -4544,9 +4601,9 @@ func (c *HisApiController) GetUploadInfo() {
 
 			if reg_type == 11 || reg_type == 1111 || reg_type == 1112 {
 
-				prescriptions, _ = service.GetPrescriptionByIds(ids_arr, adminUser.CurrentOrgId)
+				prescriptions, _ = service.GetPrescriptionByIdsTX(ids_arr, adminUser.CurrentOrgId, tx)
 			} else {
-				prescriptions, _ = service.GetSettleHisPrescription(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type)
+				prescriptions, _ = service.GetSettleHisPrescriptionTX(adminUser.CurrentOrgId, id, his_patient_id, recordDateTime, reg_type, tx)
 			}
 		} else { //月结
 
@@ -4568,9 +4625,8 @@ func (c *HisApiController) GetUploadInfo() {
 			}
 			recordEndTime := theEndTime.Unix()
 			end_time = recordEndTime
-			prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type)
+			prescriptions, _ = service.GetMonthHisPrescriptionTX(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime, reg_type, tx)
 		}
-
 		timestamp := time.Now().Unix()
 		tempTime := time.Unix(timestamp, 0)
 		timeFormat := tempTime.Format("20060102150405")
@@ -4612,7 +4668,7 @@ func (c *HisApiController) GetUploadInfo() {
 
 		allTotal := fmt.Sprintf("%.4f", total)
 		totals, _ := strconv.ParseFloat(allTotal, 64)
-		order := &models.HisOrder{
+		order := &models.HisOrder{ //
 			UserOrgId:             adminUser.CurrentOrgId,
 			HisPatientId:          his.ID,
 			PatientId:             id,
@@ -4642,8 +4698,9 @@ func (c *HisApiController) GetUploadInfo() {
 			Diagnosis:             diagnosis_id,
 			PType:                 2,
 			SetlTime:              tm.Format("2006-01-02 15:04:05"),
+			Decimal:               decimal,
 		}
-		err = service.CreateOrder(order)
+		err = service.CreateOrderTX(order, tx)
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
 			return
@@ -4739,16 +4796,28 @@ func (c *HisApiController) GetUploadInfo() {
 				Type:             types,
 				ItemId:           item_id,
 			}
-			service.CreateOrderInfo(info)
+			service.CreateOrderInfoTX(info, tx)
 		}
 		his.Diagnosis = diagnosis_id
 		his.SickType = sick_type
 		his.RegisterType = reg_type
 		his.MedicalTreatmentType = reg_type
-		service.UpdataHisPateint(&his)
-		err = service.UpDatePrescriptionNumber(adminUser.CurrentOrgId, ids, chrg_bchno)
-		err = service.UpDateHisPrescriptionInfoNumber(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime, his_patient_id)
-		err = service.UpdataOrderStatusTwo(chrg_bchno, adminUser.CurrentOrgId)
+		service.UpdataHisPateintTX(&his, tx)
+		err = service.UpDatePrescriptionNumberTX(adminUser.CurrentOrgId, ids, chrg_bchno, tx)
+		err = service.UpDateHisPrescriptionInfoNumberTX(adminUser.CurrentOrgId, id, chrg_bchno, recordDateTime, his_patient_id, tx)
+		err = service.UpdataOrderStatusTwoTX(chrg_bchno, adminUser.CurrentOrgId, tx)
+		//判断是否使用了押金
+		if dec_way == "true" {
+
+			tmpstring := strconv.FormatInt(order.ID, 10)
+			//扣押金
+			errmsg = service.SpendDeposit(c.GetAdminUserInfo().CurrentOrgId, id, c.GetAdminUserInfo().AdminUser.Id, tmpstring, decimal)
+			if errmsg != nil {
+				c.ServeFailJsonSend(enums.ErrorCodeParamWrong, errmsg.Error())
+				//c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateOrderException)
+				return
+			}
+		}
 		if err == nil {
 			c.ServeSuccessJSON(map[string]interface{}{
 				"msg": "结算成功",
@@ -4793,15 +4862,21 @@ func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	order, _ := service.GetHisOrderByID(order_id)
 	adminUser := c.GetAdminUserInfo()
+	orgid := c.GetAdminUserInfo().CurrentOrgId
 	err := service.UpdataOrderStatus(order_id, order.Number, adminUser.CurrentOrgId)
-	if err == nil {
-		c.ServeSuccessJSON(map[string]interface{}{
-			"msg": "退费成功",
-		})
-	} else {
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	}
+	tmp := strconv.FormatInt(order.ID, 10)
+	err = service.MoneyIncrease(orgid, order.HisPatientId, tmp, order.Decimal)
+	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "退费成功",
+	})
 }
 
 func (c *HisApiController) RefundNumber() {

controllers/his_deposit_controller.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 	"github.com/astaxie/beego"
 	"github.com/shopspring/decimal"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -18,27 +19,45 @@ type HisDepositApiController struct {
 }
 
 func HisDepositApiRegistRouters() {
-	beego.Router("/api/his/ttt", &HisDepositApiController{}, "get:TTT")                         //测试接口
-	beego.Router("/api/his/gethisuser", &HisDepositApiController{}, "get:GetHisUser")           //获取病例中心，有效患者名称
-	beego.Router("/api/his/adddeposit", &HisDepositApiController{}, "post:AddDeposit")          //新增押金
-	beego.Router("/api/his/getdepositcode", &HisDepositApiController{}, "get:GetDepositCode")   //获取新增押金编号
-	beego.Router("/api/his/getdeletecode", &HisDepositApiController{}, "get:GetDeleteCode")     //获取退款编号
-	beego.Router("/api/his/rechargedetails", &HisDepositApiController{}, "get:RechargeDetails") //充值明细列表
-	beego.Router("/api/his/updeposit", &HisDepositApiController{}, "get:UpDeposit")             //审核
-	beego.Router("/api/his/deletehistory", &HisDepositApiController{}, "get:DeleteHistory")     //删除
-	beego.Router("/api/his/rechargesummary", &HisDepositApiController{}, "get:RechargeSummary") //充值汇总列表
-	beego.Router("/api/his/getuserlist", &HisDepositApiController{}, "get:GetUserList")         //获取患者押金列表
-	beego.Router("/api/his/depositflow", &HisDepositApiController{}, "get:DepositFlow")         //根据患者id获取押金流水
-}
-func (this *HisDepositApiController) TTT() {
-	id, _ := this.GetInt64("id")
-	err := service.DelDecimalHistory(id)
-	this.ServeSuccessJSON(map[string]interface{}{
-		"list": err,
-	})
-	return
+	//beego.Router("/api/his/ttt", &HisDepositApiController{}, "get:TTT")                         //测试接口
+	beego.Router("/api/his/gethisuser", &HisDepositApiController{}, "get:GetHisUser")                //获取病例中心，有效患者名称
+	beego.Router("/api/his/adddeposit", &HisDepositApiController{}, "post:AddDeposit")               //新增押金
+	beego.Router("/api/his/getdepositcode", &HisDepositApiController{}, "get:GetDepositCode")        //获取新增押金编号
+	beego.Router("/api/his/getdeletecode", &HisDepositApiController{}, "get:GetDeleteCode")          //获取退款编号
+	beego.Router("/api/his/rechargedetails", &HisDepositApiController{}, "get:RechargeDetails")      //充值明细列表
+	beego.Router("/api/his/updeposit", &HisDepositApiController{}, "get:UpDeposit")                  //押金审核
+	beego.Router("/api/his/deletehistory", &HisDepositApiController{}, "get:DeleteHistory")          //押金删除
+	beego.Router("/api/his/rechargesummary", &HisDepositApiController{}, "get:RechargeSummary")      //充值汇总列表
+	beego.Router("/api/his/getuserlist", &HisDepositApiController{}, "get:GetUserList")              //获取患者押金列表
+	beego.Router("/api/his/depositflow", &HisDepositApiController{}, "get:DepositFlow")              //根据患者id获取押金流水
+	beego.Router("/api/his/deductiondetails", &HisDepositApiController{}, "get:DeductionDetails")    //扣费明细查询
+	beego.Router("/api/his/desummary", &HisDepositApiController{}, "get:DeSummary")                  //扣费汇总
+	beego.Router("/api/his/idtobalance", &HisDepositApiController{}, "get:IdToBalance")              //根据患者id查询患者的余额
+	beego.Router("/api/his/refundapplication", &HisDepositApiController{}, "post:RefundApplication") //新增一条退款申请
+	beego.Router("/api/his/refundreview", &HisDepositApiController{}, "get:RefundReview")            //退款审核通过/拒绝
+	beego.Router("/api/his/deleterefund", &HisDepositApiController{}, "get:DeleteRefund")            //退款删除
+	beego.Router("/api/his/changerefund", &HisDepositApiController{}, "post:ChangeRefund")           //更改退款申请
+	beego.Router("/api/his/refundlist", &HisDepositApiController{}, "get:RefundList")                //退款分页
+	beego.Router("/api/his/getorgname", &HisDepositApiController{}, "get:GetorgName")                //获取供应商名字
+	beego.Router("/api/his/getweektime", &HisDepositApiController{}, "get:GetWeekTime")              //获取本周时间
+	beego.Router("/api/his/getmonthtime", &HisDepositApiController{}, "get:GetMonthTime")            //获取本月时间
 }
 
+//func (this *HisDepositApiController) TTT() {
+//	orgid := this.GetAdminUserInfo().CurrentOrgId
+//	id, _ := this.GetInt64("id")
+//	code := this.GetString("code")
+//	deposit,_ := this.GetInt64("depostit")
+//	err := service.MoneyIncrease(orgid,id,code,deposit)
+//	if err != nil {
+//
+//	}
+//	this.ServeSuccessJSON(map[string]interface{}{
+//		"list": "成功",
+//	})
+//	return
+//}
+
 //获取病例中心，有效患者名称
 func (this *HisDepositApiController) GetHisUser() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
@@ -67,19 +86,43 @@ func (this *HisDepositApiController) AddDeposit() {
 	case dataBody["code"] == nil:
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金编号不能为空")
 		return
-	case dataBody["his_patient_id"] == nil:
+	case dataBody["his_patient_id"] == nil || dataBody["his_patient_id"] == "":
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "患者名称不能为空")
 		return
-	case dataBody["deposit"] == nil:
+	case dataBody["deposit"] == nil || dataBody["deposit"] == "":
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金金额不能为空")
 		return
-	case dataBody["trial_status"] == nil:
+	case dataBody["trial_status"] == nil || dataBody["trial_status"] == "":
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "审核状态不能为空")
 		return
 	}
-	code := dataBody["code"].(string)                              //押金编号
-	his_patient_id := int64(dataBody["his_patient_id"].(float64))  //患者编号
-	deposit := decimal.NewFromFloat(dataBody["deposit"].(float64)) //押金金额
+	code := dataBody["code"].(string)                             //押金编号
+	his_patient_id := int64(dataBody["his_patient_id"].(float64)) //患者编号
+	var tmps float64
+	switch dataBody["deposit"].(type) {
+	case string:
+		t_deposit := dataBody["deposit"].(string)
+		if len(t_deposit) > 0 {
+			if t_deposit[0] == 45 {
+				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金金额错误")
+				return
+			}
+		}
+		tt, errs := strconv.ParseFloat(t_deposit, 64)
+		if errs != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金金额错误")
+			return
+		} else {
+			tmps = tt
+		}
+	default:
+		tmps = dataBody["deposit"].(float64)
+	}
+	if tmps == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "押金金额不能为0")
+		return
+	}
+	deposit := decimal.NewFromFloat(tmps) //押金金额
 	var remarks string
 	if dataBody["remarks"] == nil {
 		remarks = ""
@@ -149,11 +192,11 @@ func (this *HisDepositApiController) RechargeDetails() {
 
 	namemap := make(map[int64]string)
 	slicekey := make([]int64, 0)
+	lists, _ := service.GetHisUser(orgid)
+	for _, v := range lists {
+		namemap[v.ID] = v.Name
+	}
 	if len(keyword) > 0 {
-		list, _ := service.GetHisUser(orgid)
-		for _, v := range list {
-			namemap[v.ID] = v.Name
-		}
 		for k, v := range namemap {
 			res := strings.Contains(v, keyword)
 			if res == true {
@@ -181,6 +224,8 @@ func (this *HisDepositApiController) RechargeDetails() {
 			sum = sum.Add(list[i].Deposit)
 		}
 		list[i].Name = service.GetCreateidName(list[i].CreateId)
+		list[i].HisName = namemap[list[i].HisPatientId]
+		list[i].Starttime = fmt.Sprintf(time.Unix(list[i].Ctime, 0).Format("2006-01-02"))
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list": list,
@@ -366,6 +411,13 @@ func (this *HisDepositApiController) DepositFlow() {
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, errs.Error())
 		return
 	}
+	for i := 0; i < len(deposirhistory); i++ {
+		//如果为扣费，或退费 则把订单id变为就诊号
+		if deposirhistory[i].DepositStatus == 2 || deposirhistory[i].DepositStatus == 4 {
+			tmpcode, _ := strconv.ParseInt(deposirhistory[i].DepositCode, 10, 64)
+			deposirhistory[i].DepositCode = service.FindcodeToid(tmpcode)
+		}
+	}
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"list":    deposirhistory,
@@ -375,7 +427,7 @@ func (this *HisDepositApiController) DepositFlow() {
 	return
 }
 
-//
+//获取患者押金列表
 func (this *HisDepositApiController) GetUserList() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	keyword := this.GetString("keyword")
@@ -420,6 +472,468 @@ func (this *HisDepositApiController) GetUserList() {
 	return
 }
 
+//扣费明细查询
+func (this *HisDepositApiController) DeductionDetails() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := this.GetString("keyword")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var stime int64 //开始时间
+	var etime int64 //结束时间
+
+	namemap := make(map[int64]string)
+	slicekey := make([]int64, 0)
+	lists, _ := service.GetHisUser(orgid)
+	for _, v := range lists {
+		namemap[v.ID] = v.Name
+	}
+	if len(keyword) > 0 {
+		for k, v := range namemap {
+			res := strings.Contains(v, keyword)
+			if res == true {
+				slicekey = append(slicekey, k)
+			}
+		}
+	}
+	if start_time == "" && end_time == "" {
+		stime, etime = service.GetMondayOfWeek()
+	} else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		stime = stmp.Unix()
+		etime = etmp.Unix()
+	}
+	list, err := service.DeductionList(orgid, stime, etime, keyword, slicekey)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	var sum decimal.Decimal
+	var detailslist []models.Details
+	var details models.Details
+	for i := 0; i < len(list); i++ {
+		sum = sum.Add(list[i].Deposit)
+		tmp_id, _ := strconv.ParseInt(list[i].DepositCode, 10, 64)
+		details.ID = tmp_id
+		details.Code = service.FindcodeToid(tmp_id)
+		details.NameId = list[i].HisPatientId
+		details.Name = namemap[list[i].HisPatientId]
+		details.Number = service.FindnumberToid(tmp_id)
+		details.Decimal = list[i].Deposit
+		details.ChargeDate = fmt.Sprintf(time.Unix(list[i].Ctime, 0).Format("2006-01-02 15:04:05"))
+		details.Chargetype = service.CodeToChargetype(orgid, details.Code)
+		details.Total = service.MedicalTotal(orgid, list[i].HisPatientId, details.Code)
+		detailslist = append(detailslist, details)
+	}
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": detailslist,
+		"sum":  sum,
+	})
+	return
+}
+
+//扣费汇总
+func (this *HisDepositApiController) DeSummary() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := this.GetString("keyword")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var stime int64 //开始时间
+	var etime int64 //结束时间
+
+	namemap := make(map[int64]string)
+	slicekey := make([]int64, 0)
+	lists, _ := service.GetHisUser(orgid)
+	for _, v := range lists {
+		namemap[v.ID] = v.Name
+	}
+	if len(keyword) > 0 {
+		for k, v := range namemap {
+			res := strings.Contains(v, keyword)
+			if res == true {
+				slicekey = append(slicekey, k)
+			}
+		}
+	}
+	if start_time == "" && end_time == "" {
+		stime, etime = service.GetMondayOfWeek()
+	} else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		stime = stmp.Unix()
+		etime = etmp.Unix()
+	}
+	list, err := service.DeductionList(orgid, stime, etime, keyword, slicekey)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	var sum decimal.Decimal
+	var detailslist []models.DeductionSummary
+	var details models.DeductionSummary
+	for i := 0; i < len(list); i++ {
+		sum = sum.Add(list[i].Deposit)
+		details.Name = namemap[list[i].HisPatientId]
+		details.Decimal = list[i].Deposit
+		details.Total = service.MedicalTotal(orgid, list[i].HisPatientId, list[i].DepositCode)
+		detailslist = append(detailslist, details)
+	}
+	maplist := make(map[string]models.DeductionSummary)
+	Finlist := []models.DeductionSummary{}
+	tmpslice := make([]string, 0)
+	for i := 0; i < len(detailslist); i++ {
+		if k, ok := maplist[detailslist[i].Name]; ok {
+			k.Total = k.Total.Add(detailslist[i].Total)
+			k.Decimal = k.Decimal.Add(detailslist[i].Decimal)
+			maplist[detailslist[i].Name] = models.DeductionSummary{
+				detailslist[i].Name,
+				k.Total,
+				k.Decimal,
+			}
+		} else {
+			maplist[detailslist[i].Name] = models.DeductionSummary{
+				detailslist[i].Name,
+				detailslist[i].Total,
+				detailslist[i].Decimal,
+			}
+			tmpslice = append(tmpslice, detailslist[i].Name)
+		}
+	}
+	for i := 0; i < len(tmpslice); i++ {
+		Finlist = append(Finlist, maplist[tmpslice[i]])
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": detailslist,
+		"sum":  sum,
+	})
+	return
+}
+
+//根据患者id查询患者的余额
+func (this *HisDepositApiController) IdToBalance() {
+	check := map[string][]string{
+		"his_patient_id": {"must", "int", "his_patient_id"},
+	}
+	_, err := checks(this, &check)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	his_patient_id, _ := this.GetInt64("his_patient_id")
+	tmp := service.GetUserMoney(his_patient_id, orgid)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": tmp,
+	})
+	return
+}
+
+//新增一条退款申请
+func (this *HisDepositApiController) RefundApplication() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	createid := this.GetAdminUserInfo().AdminUser.Id
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	switch {
+	case dataBody["code"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "申请编号不能为空")
+		return
+	case dataBody["his_patient_id"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "患者名称不能为空")
+		return
+	case dataBody["deposit"] == nil || dataBody["deposit"] == "":
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "退款金额不能为空")
+		return
+	case dataBody["trial_status"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "审核状态不能为空")
+		return
+	}
+	code := dataBody["code"].(string)                             //申请编号
+	his_patient_id := int64(dataBody["his_patient_id"].(float64)) //患者编号
+	//deposit := decimal.NewFromFloat(dataBody["deposit"].(float64)) //退款金额
+	var tmps float64
+	switch dataBody["deposit"].(type) {
+	case string:
+		t_deposit := dataBody["deposit"].(string)
+		if len(t_deposit) > 0 {
+			if t_deposit[0] == 45 {
+				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "退款金额错误")
+				return
+			}
+		}
+		tt, errs := strconv.ParseFloat(t_deposit, 64)
+		if errs != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "退款金额错误")
+			return
+		} else {
+			tmps = tt
+		}
+	default:
+		tmps = dataBody["deposit"].(float64)
+	}
+	if tmps == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "退款金额不能为0")
+		return
+	}
+	deposit := decimal.NewFromFloat(tmps)                     //押金金额
+	trial_status := int64(dataBody["trial_status"].(float64)) //审核状态
+
+	err = service.RefundApplication(orgid, his_patient_id, trial_status, createid, code, deposit)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "新增成功",
+	})
+	return
+
+}
+
+//退款审核通过/拒绝
+func (this *HisDepositApiController) RefundReview() {
+	check := map[string][]string{
+		"ids":          {"must", "string", "ids"},
+		"trial_status": {"must", "int", "trial_status"},
+	}
+	_, err := checks(this, &check)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	ids := this.GetString("ids") //很多id
+
+	trial_status, _ := this.GetInt64("trial_status")
+	if trial_status != 1 && trial_status != 2 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "参数trial_status值错误")
+		return
+	}
+	err = service.RefundReviewMore(orgid, trial_status, ids)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	var tmplist string
+	if trial_status == 1 {
+		tmplist = "审核通过"
+	} else {
+		tmplist = "审核拒绝"
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": tmplist,
+	})
+	return
+}
+
+//退款删除
+func (this *HisDepositApiController) DeleteRefund() {
+	check := map[string][]string{
+		"id": {"must", "int", "id"},
+	}
+	_, err := checks(this, &check)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	id, _ := this.GetInt64("id")
+	err = service.DeleteRefund(orgid, id)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "删除成功",
+	})
+	return
+}
+
+//更改退款申请
+func (this *HisDepositApiController) ChangeRefund() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	if err != nil {
+		utils.ErrorLog(err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	switch {
+	case dataBody["id"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "id不能为空")
+		return
+	case dataBody["code"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "申请编号不能为空")
+		return
+	case dataBody["his_patient_id"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "患者名称不能为空")
+		return
+	case dataBody["deposit"] == nil || dataBody["deposit"] == "":
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "退款金额不能为空")
+		return
+	case dataBody["trial_status"] == nil:
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "审核状态不能为空")
+		return
+	}
+	id := int64(dataBody["id"].(float64))
+	code := dataBody["code"].(string)                             //申请编号
+	his_patient_id := int64(dataBody["his_patient_id"].(float64)) //患者编号
+	//deposit := decimal.NewFromFloat(dataBody["deposit"].(float64)) //退款金额
+	var tmps float64
+	switch dataBody["deposit"].(type) {
+	case string:
+		t_deposit := dataBody["deposit"].(string)
+		if len(t_deposit) > 0 {
+			if t_deposit[0] == 45 {
+				this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "退款金额错误")
+				return
+			}
+		}
+		tt, errs := strconv.ParseFloat(t_deposit, 64)
+		if errs != nil {
+			this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "退款金额错误")
+			return
+		} else {
+			tmps = tt
+		}
+	default:
+		tmps = dataBody["deposit"].(float64)
+	}
+	if tmps == 0 {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, "退款金额不能为0")
+		return
+	}
+	deposit := decimal.NewFromFloat(tmps)                     //押金金额
+	trial_status := int64(dataBody["trial_status"].(float64)) //审核状态
+	err = service.ChangeRefund(orgid, his_patient_id, trial_status, id, code, deposit)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": "保存成功",
+	})
+	return
+}
+
+//退款分页
+func (this *HisDepositApiController) RefundList() {
+	check := map[string][]string{
+		"refundtype":  {"must", "int", "refundtype"},
+		"examinetype": {"must", "int", "examinetype"},
+	}
+	_, err := checks(this, &check)
+	if err != nil {
+		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())
+		return
+	}
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := this.GetString("keyword")           //获取搜索框
+	refundtype, _ := this.GetInt64("refundtype")   //获取退款类型
+	examinetype, _ := this.GetInt64("examinetype") //获取审核状态
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	var stime int64 //开始时间
+	var etime int64 //结束时间
+
+	namemap := make(map[int64]string)
+	slicekey := make([]int64, 0)
+	lists, _ := service.GetHisUser(orgid)
+	for _, v := range lists {
+		namemap[v.ID] = v.Name
+	}
+	if len(keyword) > 0 {
+		for k, v := range namemap {
+			res := strings.Contains(v, keyword)
+			if res == true {
+				slicekey = append(slicekey, k)
+			}
+		}
+	}
+	if start_time == "" && end_time == "" {
+		stime, etime = service.GetMondayOfWeek()
+	} else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		etmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		stime = stmp.Unix()
+		etime = etmp.Unix()
+	}
+	depo := []models.RefundList{}
+	depo, err = service.RefundList(orgid, stime, etime, refundtype, examinetype, keyword, slicekey)
+	if err != nil {
+		utils.ErrorLog("查询失败，原因为：", err.Error())
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	for i := 0; i < len(depo); i++ {
+		depo[i].Name = service.GetCreateidName(depo[i].CreateId)
+		depo[i].HisName = namemap[depo[i].HisPatientId]
+		if depo[i].Mtime > depo[i].Ctime {
+			depo[i].Starttime = fmt.Sprintf(time.Unix(depo[i].Mtime, 0).Format("2006-01-02 15:04:05"))
+		} else {
+			depo[i].Starttime = fmt.Sprintf(time.Unix(depo[i].Ctime, 0).Format("2006-01-02 15:04:05"))
+		}
+		if depo[i].DepositStatus == 4 {
+			depo[i].Name = "-"
+		}
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": depo,
+	})
+	return
+}
+
+func (this *HisDepositApiController) GetorgName() {
+	orgid := this.GetAdminUserInfo().CurrentOrgId
+	name := service.GetorgName(orgid)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list": name,
+	})
+	return
+}
+
+//获取本月时间
+func (this *HisDepositApiController) GetMonthTime() {
+	stime, etime := service.GetMonth()
+	srart_time := fmt.Sprintf(time.Unix(stime, 0).Format("2006-01-02"))
+	end_time := fmt.Sprintf(time.Unix(etime, 0).Format("2006-01-02"))
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"srart_time": srart_time,
+		"end_time":   end_time,
+	})
+	return
+}
+
+//获取本周时间
+func (this *HisDepositApiController) GetWeekTime() {
+	stime, etime := service.GetMondayOfWeek()
+	srart_time := fmt.Sprintf(time.Unix(stime, 0).Format("2006-01-02"))
+	end_time := fmt.Sprintf(time.Unix(etime, 0).Format("2006-01-02"))
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"srart_time": srart_time,
+		"end_time":   end_time,
+	})
+	return
+}
+
 //判断前端参数是否为空
 func checks(this *HisDepositApiController, m *map[string][]string) (map[string]string, error) {
 	tmp := make(map[string]string)

controllers/his_project_api_controller.go

@@ -1117,6 +1117,9 @@ func (this *HisProjectApiController) GetPatientcaseHistory() {
 	history, _ := service.GetPatientCaseHistory(patient_id)
 	hispatient, _ := service.GetHisPatientById(patient_id)
 
+	//获取患者最后一次的血管通路
+	accessList, _ := service.GetPatientVascularAccess(patient_id)
+
 	if err != nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
 		return
@@ -1125,6 +1128,7 @@ func (this *HisProjectApiController) GetPatientcaseHistory() {
 		"patient":    patient,
 		"history":    history,
 		"hispatient": hispatient,
+		"accessList": accessList,
 	})
 }
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -197,20 +197,6 @@ func (this *DialysisAPIController) Scheduals() {
 				project, _ = service.GetAllHisProjectPrescription(orgID, date.Unix())
 			}
 
-			//获取今日透析准备的数据
-			//goodList, err := service.MobileGetDialysisGoodsSeven(orgID, date.Unix())
-
-			//list, err := service.MobileGetDialysisGoodsSix(orgID, date.Unix())
-
-			//autoList, _ := service.GetMobileAutoReduce(orgID, date.Unix())
-			//for _, item := range goodList {
-			//	for _, it := range list {
-			//		if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
-			//			item.Children = append(item.Children, it)
-			//		}
-			//	}
-			//}
-			//fmt.Println("goodlist888888888888888888888", goodList, err)
 			this.ServeSuccessJSON(map[string]interface{}{
 				"scheduals": scheduals,
 				"project":   project,
@@ -580,19 +566,10 @@ func (this *DialysisAPIController) DialysisRecord() {
 		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
 	}
 
-	//获取今日透析准备的数据
-	//goodList, _ := service.MobileGetDialysisGoodsSeven(adminInfo.Org.Id, date.Unix())
-	//list, _ := service.MobileGetDialysisGoodsSix(adminInfo.Org.Id, date.Unix())
-	//
-	//autoList, _ := service.GetMobileAutoReduce(adminInfo.Org.Id, date.Unix())
-	//for _, item := range goodList {
-	//	for _, it := range list {
-	//		if item.RecordDate == it.RecordDate && item.PatientId == it.PatientId {
-	//			item.Children = append(item.Children, it)
-	//		}
-	//	}
-	//}
-
+	is_advice_open, _ := service.FindAdviceSettingById(adminInfo.Org.Id)
+	if is_advice_open.IsAdviceOpen == 1 {
+		his_advices, _ = service.GetAllHisDoctorAdvice(adminInfo.Org.Id, patientID, date.Unix())
+	}
 	returnData := map[string]interface{}{
 		"patient":                        patient,
 		"schedual":                       schedual,
@@ -623,8 +600,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 		"is_project_open_config":         is_project_open_config,
 		"project":                        projects,
 		"team_projects":                  team_projects,
-		//"goodList":                       goodList,
-		//"autoList":                       autoList,
+		"is_advice_open":                 is_advice_open,
 	}
 	this.ServeSuccessJSON(returnData)
 }
@@ -3277,6 +3253,7 @@ func (c *DialysisAPIController) GetLongAdvice() {
 	adminUserInfo := c.GetMobileAdminUserInfo()
 	_, config := service.FindDoctorAdviceRecordByOrgId(adminUserInfo.Org.Id)
 	_, hisConfig := service.FindXTHisRecordByOrgId(adminUserInfo.Org.Id)
+	is_advice_open, _ := service.FindAdviceSettingById(adminUserInfo.Org.Id)
 	//patient, _ := service.FindPatientIsOpenRemindById(patient_id, adminUserInfo.Org.Id)
 	if config.IsOpenRemind == 0 { //针对老用户，即没开启推送功能，也没有	不开启推送功能，不做任何处理
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -3358,6 +3335,7 @@ func (c *DialysisAPIController) GetLongAdvice() {
 				"advices_two":     RemoveRepeatedElement(advice_three),
 				"is_open_remind":  config.IsOpenRemind,
 				"his_config_open": hisConfig.IsOpen,
+				"is_advice_open":  is_advice_open.IsAdviceOpen,
 			})
 		}
 	}

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -59,8 +59,7 @@ type MobileBaseAPIAuthController struct {
 func (this *MobileBaseAPIAuthController) Prepare() {
 	token := this.Ctx.GetCookie("token_cookie")
 	logout_cookie := this.Ctx.GetCookie("logout_cookie")
-	fmt.Println("token232232232323232332232332323322332232323", token)
-	fmt.Println("login232232232323232332232332323322332232323", logout_cookie)
+
 	//if len(token) == 0{
 	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 	//	this.StopRun()
@@ -76,6 +75,7 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLogOut)
 			this.StopRun()
 		} else {
+
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeLoginTimeout)
 			this.StopRun()
 		}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -628,6 +628,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			//清空key 值
 			redis.Set(key, "", time.Second)
 			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+
 			redis.Set(keyTwo, "", time.Second)
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
 			redis.Set(keyThree, "", time.Second)
@@ -648,6 +649,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
 			redis := service.RedisClient()
 			keyTwo := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":advice_list_all"
+
 			redis.Set(keyTwo, "", time.Second)
 			keyThree := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":his_doctor_advice"
 			redis.Set(keyThree, "", time.Second)

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -23,6 +23,7 @@ type NewLoginApiController struct {
 
 func (this *NewLoginApiController) GetLogin() {
 	token_cookie := this.Ctx.GetCookie("token_cookie")
+
 	if len(token_cookie) == 0 {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"isLogin": false,

controllers/patient_api_controller.go

@@ -735,7 +735,11 @@ func (c *PatientApiController) EditLapseto() {
 	err = service.EditPatientLapseto(&patient, &lapseto)
 
 	if lapseto.LapsetoType == 3 || lapseto.LapsetoType == 2 {
-		service.UpdateScheduleByDeathTime(id, lapsetoTimeUnix.Unix())
+		timeStr := time.Now().Format("2006-01-02")
+		timeLayout := "2006-01-02 15:04:05"
+		timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+		timenow := timeStringToTime.Unix()
+		service.UpdateScheduleByDeathTime(id, timenow)
 		service.UpdateScheduleItemByPatientId(id)
 	}
 

controllers/schedule_api_controller.go

@@ -1894,7 +1894,16 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 				for _, item := range schedules {
 					service.CreateScheduleTemplate(item)
 				}
-
+				//查询已经转出或者死亡的患者
+				patientList, _ := service.GetDeathPatient(this.GetAdminUserInfo().CurrentOrgId)
+				for _, it := range patientList {
+					timeStr := time.Now().Format("2006-01-02")
+					timeLayout := "2006-01-02 15:04:05"
+					timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+					timenow := timeStringToTime.Unix()
+					service.UpdateScheduleByDeathTime(it.ID, timenow)
+					service.UpdateScheduleItemByPatientId(it.ID)
+				}
 				log := models.ExportLog{
 					LogType:    3,
 					UserOrgId:  this.GetAdminUserInfo().CurrentOrgId,
@@ -2217,6 +2226,16 @@ func (this *ScheduleApiController) GetCopyPatientSchedules() {
 		}
 
 		err := service.AddPatientSchedule(&schedule)
+		patientList, _ := service.GetDeathPatient(this.GetAdminUserInfo().CurrentOrgId)
+		for _, it := range patientList {
+			timeStr := time.Now().Format("2006-01-02")
+			timeLayout := "2006-01-02 15:04:05"
+			timeStringToTime, _ := utils.ParseTimeStringToTime(timeLayout, timeStr+" 00:00:00")
+			timenow := timeStringToTime.Unix()
+			service.UpdateScheduleByDeathTime(it.ID, timenow)
+			service.UpdateScheduleItemByPatientId(it.ID)
+		}
+
 		if err != nil {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return

models/his_deposit_models.go

@@ -23,7 +23,7 @@ type DepositHistory struct {
 	DepositCode    string          `gorm:"column:deposit_code" json:"deposit_code" form:"deposit_code"`
 	Deposit        decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"`                         //本次操作金额
 	SurplusDeposit decimal.Decimal `gorm:"column:surplus_deposit" json:"surplus_deposit" form:"surplus_deposit"` //剩余金额
-	DepositStatus  int64           `gorm:"column:deposit_status" json:"deposit_status" form:"deposit_status"`    //1：充值,2：扣费,3：退费
+	DepositStatus  int64           `gorm:"column:deposit_status" json:"deposit_status" form:"deposit_status"`    //1：充值,2：扣费,3：退款,4：退费
 	Status         int64           `gorm:"column:status" json:"status" form:"status"`
 	CreateId       int64           `gorm:"column:create_id" json:"create_id" form:"create_id"`
 	Ctime          int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
@@ -52,7 +52,7 @@ type DepositHistoryname struct {
 	DepositCode    string          `gorm:"column:deposit_code" json:"deposit_code" form:"deposit_code"`
 	Deposit        decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"`                         //本次操作金额
 	SurplusDeposit decimal.Decimal `gorm:"column:surplus_deposit" json:"surplus_deposit" form:"surplus_deposit"` //剩余金额
-	DepositStatus  int64           `gorm:"column:deposit_status" json:"deposit_status" form:"deposit_status"`    //1：充值,2：扣费,3：退费
+	DepositStatus  int64           `gorm:"column:deposit_status" json:"deposit_status" form:"deposit_status"`    //1：充值,2：扣费,3：退款,4：退费
 	Status         int64           `gorm:"column:status" json:"status" form:"status"`
 	CreateId       int64           `gorm:"column:create_id" json:"create_id" form:"create_id"`
 	Ctime          int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
@@ -60,12 +60,36 @@ type DepositHistoryname struct {
 	TrialStatus    int64           `gorm:"column:trial_status" json:"trial_status" form:"trial_status"` //审核状态0：未审核 ，1：已审核
 	Remarks        string          `gorm:"column:remarks" json:"remarks" form:"remarks"`                //备注
 	Name           string          ` json:"name" `
+	HisName        string          `json:"his_name"`
+	Starttime      string          `json:"starttime"` //创建时间
 }
 
 func (DepositHistoryname) TableName() string {
 	return "sgj_xt.his_deposit_history"
 }
 
+type RefundList struct {
+	ID             int64           `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId      int64           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`          //机构id
+	HisPatientId   int64           `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"` //his病人id
+	DepositCode    string          `gorm:"column:deposit_code" json:"deposit_code" form:"deposit_code"`
+	Deposit        decimal.Decimal `gorm:"column:deposit" json:"deposit" form:"deposit"`                         //本次操作金额
+	SurplusDeposit decimal.Decimal `gorm:"column:surplus_deposit" json:"surplus_deposit" form:"surplus_deposit"` //剩余金额
+	DepositStatus  int64           `gorm:"column:deposit_status" json:"deposit_status" form:"deposit_status"`    //1：充值,2：扣费,3：退款,4：退费
+	Status         int64           `gorm:"column:status" json:"status" form:"status"`
+	CreateId       int64           `gorm:"column:create_id" json:"create_id" form:"create_id"`
+	Ctime          int64           `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime          int64           `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	TrialStatus    int64           `gorm:"column:trial_status" json:"trial_status" form:"trial_status"` //审核状态0：未审核 ，1：已审核
+	Starttime      string          `json:"starttime"`                                                   //申请时间
+	Name           string          ` json:"name" `                                                      //申请人
+	HisName        string          `json:"his_name"`
+}
+
+func (RefundList) TableName() string {
+	return "sgj_xt.his_deposit_history"
+}
+
 type CreateUser struct {
 	ID   int64  `gorm:"column:id" json:"id" form:"id"`
 	Name string `gorm:"column:name" json:"name" form:"name"`
@@ -95,3 +119,43 @@ type Deposit1 struct {
 func (Deposit1) TableName() string {
 	return "sgj_xt.his_deposit"
 }
+
+//扣费明细列表
+type Details struct {
+	ID         int64           `json:"id"`          //原始code
+	Code       string          `json:"code"`        //就诊号
+	Number     string          `json:"number"`      //批号，用来跳转用的
+	NameId     int64           `json:"name_id"`     //患者id
+	Name       string          `json:"name"`        //患者名字
+	Chargetype string          `json:"chargetype"`  //医收费类型
+	Total      decimal.Decimal `json:"total"`       //医疗费总额
+	Decimal    decimal.Decimal `json:"decimal"`     //押金支付金额
+	ChargeDate string          `json:"charge_date"` //收费日期
+}
+
+//扣费汇总
+type DeductionSummary struct {
+	Name    string          `json:"name"`    //患者名字
+	Total   decimal.Decimal `json:"total"`   //医疗费总额
+	Decimal decimal.Decimal `json:"decimal"` //押金支付金额
+}
+
+type GetorgName struct {
+	ID      int64  `json:"id"`
+	OrgName string `json:"org_name"`
+}
+
+func (GetorgName) TableName() string {
+	return "sgj_users.sgj_user_org"
+}
+
+//获取就诊号
+type GetMdtrtId struct {
+	Id      int64  `json:"id"`
+	MdtrtId string `json:"mdtrt_id"`
+	Number  string `json:"number"`
+}
+
+func (GetMdtrtId) TableName() string {
+	return "sgj_xt.his_order"
+}

models/his_models.go

@@ -1022,6 +1022,7 @@ type HisOrder struct {
 	DoctorName            string    `gorm:"-" json:"doctor_name" form:"doctor_name"`
 	Creator               int64     `gorm:"column:creator" json:"creator" form:"creator"`
 	PType                 int64     `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	Decimal               float64   `gorm:"column:decimal" json:"decimal" form:"decimal"`
 
 	FaPiaoCode   string `gorm:"column:fa_piao_code" json:"fa_piao_code" form:"fa_piao_code"`
 	FaPiaoNumber string `gorm:"column:fa_piao_number" json:"fa_piao_number" form:"fa_piao_number"`

service/admin_service.go

@@ -30,6 +30,7 @@ func GetTotalOrgCount() (int, error) {
 		return 0, err
 	}
 	return count, nil
+
 }
 
 // 获取一段时间内注册的机构数量

service/dialysis_service.go

@@ -1433,6 +1433,13 @@ func GetAllPcPatientListByListSeven(orgID int64) (patients []*MSchedualPatientVM
 	return patients, err
 }
 
+func GetAllPcPatientListByListEight(orgID int64) (patients []*MSchedualPatientVMList, err error) {
+
+	err = readDb.Where("user_org_id=? and status=1", orgID).Find(&patients).Error
+
+	return patients, err
+}
+
 func GetAllPcPatientListByList(orgID int64) (patients []*MSchedualPatientVMList, err error) {
 	redis := RedisClient()
 	defer redis.Close()

service/his_deposit_service.go

@@ -4,9 +4,11 @@ import (
 	"XT_New/models"
 	"XT_New/utils"
 	"fmt"
+	"github.com/jinzhu/gorm"
 	"github.com/shopspring/decimal"
 	"math/rand"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -42,6 +44,7 @@ func UpDeposit(code, remarks string, his_patient_id, orgid, trial_status, create
 			UserOrgId:    orgid,
 			HisPatientId: his_patient_id,
 			Ctime:        time.Now().Unix(),
+			Mtime:        time.Now().Unix(),
 			Status:       1,
 		}
 		i, d, err := AddDeposit(de)
@@ -52,6 +55,7 @@ func UpDeposit(code, remarks string, his_patient_id, orgid, trial_status, create
 		tmp = i
 		tmpdeposit = d
 	}
+	s_deposit := tmpdeposit
 	if trial_status == 1 {
 		de := models.Deposit{
 			ID:      tmp,
@@ -63,13 +67,14 @@ func UpDeposit(code, remarks string, his_patient_id, orgid, trial_status, create
 			utils.ErrorLog("添加用户押金失败: %v", err.Error())
 			return
 		}
+		s_deposit = deposit.Add(tmpdeposit)
 	}
 	dehistory := models.DepositHistory{
 		UserOrgId:      orgid,
 		HisPatientId:   his_patient_id,
 		DepositCode:    code,
-		Deposit:        deposit,                 //本次操作的押金
-		SurplusDeposit: tmpdeposit.Add(deposit), //剩余金额
+		Deposit:        deposit,   //本次操作的押金
+		SurplusDeposit: s_deposit, //剩余金额
 		DepositStatus:  1,
 		Status:         1,
 		CreateId:       createid,
@@ -197,6 +202,7 @@ func GetMonth() (int64, int64) {
 	timeMonthEndUnix1 := timeToday.AddDate(0, 1, -timeToday.Day()+1).Unix() - 1                            // 获取下个月第一天/ 本月最后一天24点 时间戳类型
 	return timeMonthStartUnix1, timeMonthEndUnix1
 }
+
 func GetCreateidName(id int64) string {
 	var tmp models.CreateUser
 	XTReadDB().Select("name").Where("id = ?", id).Find(&tmp)
@@ -209,7 +215,7 @@ func UpDecimalHistory(id int64) (err error) {
 	tx := XTWriteDB().Begin()
 	defer func() {
 		if err != nil {
-			utils.ErrorLog("事务失败，原因为", err)
+			utils.ErrorLog("事务失败，原因为: %v", err)
 			tx.Rollback()
 		} else {
 			tx.Commit()
@@ -261,7 +267,10 @@ func GetDecimalHistoryOne(id int64) (history models.DepositHistory, err error) {
 //根据患者id获取该患者当前剩余的押金
 func GetUserMoney(id, orgid int64) decimal.Decimal {
 	tmp := models.Deposit{}
-	XTReadDB().Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&tmp)
+	err := XTReadDB().Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", id, orgid).Find(&tmp).Error
+	if err != nil {
+		return decimal.NewFromFloat(0)
+	}
 	return tmp.Deposit
 }
 
@@ -282,23 +291,475 @@ func GetFlowList(id, orgid, stime, etime, deposit_status int64) (deposit []model
 	return
 }
 
+//获取患者押金列表
 func GetUserList(page, limit, orgid int64, keyword string, slicekey []int64) (m []models.Deposit1, total int64, err error) {
 	db := XTReadDB().Model(&models.Deposit{}).Where("status = 1 and user_org_id = ? ", orgid)
 	offset := (page - 1) * limit
-	if len(slicekey) > 0 {
-		tmp := ""
-		for i := 0; i < len(slicekey); i++ {
-			tmp = tmp + " his_patient_id = " + strconv.FormatInt(slicekey[i], 10)
-			if i < len(slicekey)-1 {
-				tmp = tmp + " or "
+	if len(keyword) > 0 {
+		db = db.Where(" his_patient_id = ? ", keyword)
+	}
+	err = db.Count(&total).Offset(offset).Order("mtime desc").Find(&m).Error
+	return
+}
+
+//扣费明细列表
+func DeductionList(orgid, stime, etime int64, keyword string, slicekey []int64) (deposithistory []models.DepositHistory, err error) {
+	db := XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and user_org_id = ? and deposit_status = 2 ", orgid).Where("ctime >= ? and ctime <= ?", stime, etime)
+	if len(keyword) > 0 {
+		var tmp string = "deposit_code like ?"
+		if len(slicekey) > 0 {
+			for i := 0; i < len(slicekey); i++ {
+				tmp = tmp + " or his_patient_id = " + strconv.FormatInt(slicekey[i], 10)
 			}
 		}
-		db = db.Where(tmp)
+		keyword = "%" + keyword + "%"
+		db = db.Where(tmp, keyword)
+	}
+	err = db.Order("ctime desc").Find(&deposithistory).Error
+	return
+}
+
+//获取医疗费总额
+func MedicalTotal(orgid, patient_id int64, code string) decimal.Decimal {
+	tmp := models.HisChargeSettleOrder{}
+	XTReadDB().Model(&models.HisChargeSettleOrder{}).Where("mdtrt_id = ? and patient_id = ? and user_org_id = ? and status = 1 and order_status = 2", code, patient_id, orgid).Find(&tmp)
+	return decimal.NewFromFloat(tmp.MedfeeSumamt)
+}
+
+//根据就诊号查询出医收费类型
+func CodeToChargetype(orgid int64, code string) (s string) {
+	tmp := models.HisPrintPatient{}
+	XTReadDB().Model(&models.HisPrintPatient{}).Where("number = ? and user_org_id = ?", code, orgid).Find(&tmp)
+	//tmp.BalanceAccountsType
+	switch tmp.BalanceAccountsType {
+	case 1:
+		s = "医保"
+	case 2:
+		s = "自费"
+	case 3:
+		s = "公费"
+	case 4:
+		s = "农保"
+	case 5:
+		s = "会员"
+	case 6:
+		s = "职工"
+	case 7:
+		s = "合同"
+	case 8:
+		s = "医保自费"
+	default:
+		s = "类型未定义"
+	}
+	return
+}
+
+//扣除患者的押金,并生成一条扣费历史记录
+//orgid 机构id;
+//his_user_id	患者id;
+//create_id		创建者id;
+//code		就诊号;
+//deposit	本次使用的押金金额，支持float64、int、int64、decimal.Decimal类型
+func SpendDeposit(orgid, his_user_id, create_id int64, code string, deposit interface{}) (err error) {
+	tmp_deposit := decimal.Decimal{} //本次患者使用的押金
+	tmp_deposit, err = ToDecimal(deposit)
+	if err != nil {
+		return
+	}
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败,原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	//查询患者押金
+	tmp := models.Deposit{}
+	err = tx.Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", his_user_id, orgid).Find(&tmp).Error
+	if err != nil {
+		err = fmt.Errorf("押金余额不足")
+		return
+	}
+	//判断能否扣除
+	if tmp.Deposit.Cmp(tmp_deposit) == -1 {
+		err = fmt.Errorf("押金余额不足")
+		return
+	}
+	//扣除患者押金
+	err = tx.Model(&models.Deposit{}).Where("id = ? and status = 1", tmp.ID).Updates(map[string]interface{}{
+		"mtime":   time.Now().Unix(),
+		"deposit": tmp.Deposit.Sub(tmp_deposit),
+	}).Error
+	if err != nil {
+		return
+	}
+	//生成一条历史记录
+	dehistory := models.DepositHistory{
+		UserOrgId:      orgid,
+		HisPatientId:   his_user_id,
+		DepositCode:    code,
+		Deposit:        tmp_deposit,
+		SurplusDeposit: tmp.Deposit.Sub(tmp_deposit),
+		DepositStatus:  2,
+		Status:         1,
+		CreateId:       create_id,
+		Ctime:          time.Now().Unix(),
+		Mtime:          time.Now().Unix(),
+		TrialStatus:    1,
+	}
+	err = tx.Create(&dehistory).Error
+	return
+}
+
+//新增一条退款申请
+func RefundApplication(orgid, his_patient_id, trial_status, createid int64, code string, deposit decimal.Decimal) (err error) {
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败,原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	//获取患者当前余额
+	tmp := models.Deposit{}
+	err = tx.Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", his_patient_id, orgid).Find(&tmp).Error
+	if err != nil {
+		return
+	}
+	//判断是否可以退款
+	if tmp.Deposit.Cmp(deposit) == -1 {
+		err = fmt.Errorf("退款金额不得大于押金余额!")
+		return
+	}
+	s_deposit := tmp.Deposit
+	//判断是否审核通过，通过更新当前押金，否则只新增一条历史记录
+	if trial_status == 1 {
+		//更新患者当前押金余额
+		err = tx.Model(&models.Deposit{}).Where("id = ? and status = 1", tmp.ID).Updates(map[string]interface{}{
+			"mtime":   time.Now().Unix(),
+			"deposit": tmp.Deposit.Sub(deposit),
+		}).Error
+		if err != nil {
+			return
+		}
+		s_deposit = tmp.Deposit.Sub(deposit)
+	}
+	//生成一条历史记录
+	dehistory := models.DepositHistory{
+		UserOrgId:      orgid,
+		HisPatientId:   his_patient_id,
+		DepositCode:    code,
+		Deposit:        deposit,
+		SurplusDeposit: s_deposit,
+		DepositStatus:  3, //3退款，4退费
+		Status:         1,
+		CreateId:       createid,
+		Ctime:          time.Now().Unix(),
+		Mtime:          time.Now().Unix(),
+		TrialStatus:    trial_status,
+	}
+	err = tx.Create(&dehistory).Error
+	return
+}
+
+//退款审核通过/拒绝批量处理
+func RefundReviewMore(orgid, trial_status int64, ids string) (err error) {
+	//处理下字符串
+	t_ids := ""
+	if ids[len(ids)-1] == 44 {
+		t_ids = ids[:len(ids)-1]
 	} else {
-		if len(keyword) > 0 {
+		t_ids = ids
+	}
+	tmp_id := strings.Split(t_ids, ",")
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败，原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	//循环处理id
+	for i := 0; i < len(tmp_id); i++ {
+		var id int64
+		id, err = strconv.ParseInt(tmp_id[i], 10, 64)
+		if err != nil {
+			return err
+		}
+		err = RefundReview(orgid, id, trial_status, tx)
+		if err != nil {
+			return err
+		}
+	}
+	return err
+}
+
+//退款审核通过/拒绝
+func RefundReview(orgid, id, trial_status int64, tx *gorm.DB) (err error) {
+	//根据id查询该条历史记录
+	history := models.DepositHistory{}
+	err = tx.Model(&models.DepositHistory{}).Where("id = ? and status = 1", id).Find(&history).Error
+	if err != nil {
+		return err
+	}
+	//判断状态是否为未审核
+	if history.TrialStatus != 0 {
+		err = fmt.Errorf("所选单据中包含了无需审核的单据")
+		return err
+	}
+	//判断类型是否为3,3代表退款，4为退费
+	if history.DepositStatus != 3 {
+		err = fmt.Errorf("所选单据中包含了无需审核的单据")
+		return err
+	}
+	up := make(map[string]interface{})
+	//通过
+	if trial_status == 1 {
+		//拿患者的id和机构id在去查患者的余额
+		tt := models.Deposit{}
+		err = tx.Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", history.HisPatientId, orgid).Find(&tt).Error
+		if err != nil {
+			return err
+		}
+		//判断是否可以修改患者押金
+		if tt.Deposit.Cmp(history.Deposit) == -1 {
+			err = fmt.Errorf("当前押金余额小于退款金额，无法完成退款")
+			return err
+		}
+		//修改患者押金
+		err = tx.Model(&models.Deposit{}).Where("id = ? and status = 1", tt.ID).Updates(map[string]interface{}{
+			"mtime":   time.Now().Unix(),
+			"deposit": tt.Deposit.Sub(history.Deposit),
+		}).Error
+		if err != nil {
+			return err
+		}
+		up = map[string]interface{}{
+			"mtime":           time.Now().Unix(),
+			"surplus_deposit": tt.Deposit.Sub(history.Deposit),
+			"trial_status":    1,
+		}
+	} else {
+		up = map[string]interface{}{
+			"mtime":        time.Now().Unix(),
+			"trial_status": 2,
+		}
+	}
+	//修改一条历史记录
+	err = tx.Model(&models.DepositHistory{}).Where("id = ? and status = 1", id).Updates(up).Error
+	return err
+}
+
+//退款删除
+func DeleteRefund(orgid, id int64) (err error) {
+	//根据id查询历史记录
+	history := models.DepositHistory{}
+	err = XTReadDB().Model(&models.DepositHistory{}).Where("id = ?", id).Find(&history).Error
+	if err != nil {
+		return
+	}
+	//判断是否可以删除
+	if history.TrialStatus == 1 || history.DepositStatus != 3 {
+		err = fmt.Errorf("当前状态不可删除！")
+		return
+	}
+	//删除
+	err = XTWriteDB().Model(&models.DepositHistory{}).Where("id = ?", id).Updates(map[string]interface{}{
+		"mtime":  time.Now().Unix(),
+		"status": 0,
+	}).Error
+
+	return
+}
+
+//更改退款申请
+func ChangeRefund(orgid, his_patient_id, trial_status, id int64, code string, deposit decimal.Decimal) (err error) {
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败,原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	//获取患者当前余额
+	tmp := models.Deposit{}
+	err = tx.Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", his_patient_id, orgid).Find(&tmp).Error
+	if err != nil {
+		return
+	}
+	//判断是否可以退款
+	if tmp.Deposit.Cmp(deposit) == -1 {
+		err = fmt.Errorf("退款金额不得大于押金余额!")
+		return
+	}
+	up := make(map[string]interface{})
+	//判断是否审核通过，通过更新当前押金，否则只新增一条历史记录
+	if trial_status == 1 {
+		//更新患者当前押金余额
+		err = tx.Model(&models.Deposit{}).Where("id = ? and status = 1", tmp.ID).Updates(map[string]interface{}{
+			"mtime":   time.Now().Unix(),
+			"deposit": tmp.Deposit.Sub(deposit),
+		}).Error
+		if err != nil {
 			return
 		}
+		up = map[string]interface{}{
+			"mtime":           time.Now().Unix(),
+			"deposit_code":    code,
+			"his_patient_id":  his_patient_id,
+			"surplus_deposit": tmp.Deposit.Sub(deposit),
+			"deposit":         deposit,
+			"trial_status":    trial_status,
+		}
+	} else {
+		up = map[string]interface{}{
+			"mtime":          time.Now().Unix(),
+			"deposit_code":   code,
+			"his_patient_id": his_patient_id,
+			"deposit":        deposit,
+			"trial_status":   trial_status,
+		}
+	}
+	//更新一条历史记录
+	err = tx.Model(&models.DepositHistory{}).Where("id = ? and status = 1", id).Updates(up).Error
+	return
+}
+
+//退款分页
+func RefundList(orgid, stime, etime, refundtype, examinetype int64, keyword string, slicekey []int64) (depo []models.RefundList, err error) {
+	db := XTReadDB().Model(&models.DepositHistory{}).Where("status = 1 and user_org_id = ? ", orgid).Where("ctime >= ? and ctime <= ?", stime, etime)
+	//退款类型
+	switch refundtype {
+	case 0:
+		db = db.Where(" deposit_status in (3,4) ")
+	case 3, 4:
+		db = db.Where(" deposit_status = ? ", refundtype)
+	default:
+		err = fmt.Errorf("退款类型错误")
+		return
+	}
+	//审核状态
+	switch examinetype {
+	case 0, 1, 2:
+		db = db.Where(" trial_status = ? ", examinetype)
+	case 3: //代表查询全部
+		db = db
+	default:
+		err = fmt.Errorf("审核状态错误")
+		return
+	}
+	if len(keyword) > 0 {
+		tmp := "deposit_code like ? "
+		if len(slicekey) > 0 {
+			for i := 0; i < len(slicekey); i++ {
+				tmp = tmp + " or his_patient_id = " + strconv.FormatInt(slicekey[i], 10)
+			}
+		}
+		keyword = "%" + keyword + "%"
+		db = db.Where(tmp, keyword)
+	}
+	err = db.Order("ctime desc").Find(&depo).Error
+	return
+
+}
+
+//退回患者的押金，并生成一条退费历史记录
+//orgid 机构id
+//his_user_id 患者id
+//code 编号
+//deposit 本次退费的金额，支持float64、int、int64、decimal.Decimal类型
+func MoneyIncrease(orgid, his_user_id int64, code string, deposit interface{}) (err error) {
+	tmp_deposit := decimal.Decimal{}
+	tmp_deposit, err = ToDecimal(deposit)
+	if err != nil {
+		return
+	}
+	//开事务
+	tx := XTWriteDB().Begin()
+	defer func() {
+		if err != nil {
+			utils.ErrorLog("事务失败,原因为: %v", err.Error())
+			tx.Rollback()
+		} else {
+			tx.Commit()
+		}
+	}()
+	//获取当前患者押金
+	tmp := models.Deposit{}
+	err = tx.Model(&models.Deposit{}).Where("his_patient_id = ? and user_org_id = ? and status = 1", his_user_id, orgid).Find(&tmp).Error
+	if err != nil {
+		return
+	}
+	//退回患者押金
+	err = tx.Model(&models.Deposit{}).Where("id = ? and status = 1", tmp.ID).Updates(map[string]interface{}{
+		"mtime":   time.Now().Unix(),
+		"deposit": tmp.Deposit.Add(tmp_deposit),
+	}).Error
+	if err != nil {
+		return
+	}
+	//生成一条退费记录
+	dehistory := models.DepositHistory{
+		UserOrgId:      orgid,
+		HisPatientId:   his_user_id,
+		DepositCode:    code,
+		Deposit:        tmp_deposit,
+		SurplusDeposit: tmp.Deposit.Add(tmp_deposit),
+		DepositStatus:  4,
+		Status:         1,
+		CreateId:       0,
+		Ctime:          time.Now().Unix(),
+		Mtime:          time.Now().Unix(),
+		TrialStatus:    1,
+	}
+	err = tx.Create(&dehistory).Error
+	return
+}
+func GetorgName(orgid int64) (name string) {
+	tmp := models.GetorgName{}
+	XTReadDB().Model(&models.GetorgName{}).Where("id = ? ", orgid).Find(&tmp)
+	return tmp.OrgName
+}
+
+//根据id查询就诊号
+func FindcodeToid(id int64) (code string) {
+	tmp := models.GetMdtrtId{}
+	XTReadDB().Model(&models.GetMdtrtId{}).Where("id = ?", id).Find(&tmp)
+	return tmp.MdtrtId
+}
+
+//根据id查询就诊号
+func FindnumberToid(id int64) (number string) {
+	tmp := models.GetMdtrtId{}
+	XTReadDB().Model(&models.GetMdtrtId{}).Where("id = ?", id).Find(&tmp)
+	return tmp.Number
+}
+
+//把其他的类型转换成decimal.Decimal类型
+func ToDecimal(i interface{}) (d decimal.Decimal, err error) {
+	switch i.(type) {
+	case float64:
+		d = decimal.NewFromFloat(i.(float64))
+	case decimal.Decimal:
+		d = i.(decimal.Decimal)
+	case int64:
+		d = decimal.NewFromFloat(float64(i.(int64)))
+	case int:
+		d = decimal.NewFromFloat(float64(i.(int)))
+	default:
+		err = fmt.Errorf("类型解析错误")
 	}
-	err = db.Count(&total).Offset(offset).Order("mtime desc").Find(&m).Error
 	return
 }

service/his_project_service.go

@@ -748,6 +748,11 @@ func GetHisPatientByIdThree(id int64) (models.HisPatient, error) {
 	err := XTReadDB().Model(&patient).Where("id = ? and status = 1", id).First(&patient).Error
 	return patient, err
 }
+func GetHisPatientByIdThreeTX(id int64, tx *gorm.DB) (models.HisPatient, error) {
+	patient := models.HisPatient{}
+	err := tx.Model(&patient).Where("id = ? and status = 1", id).First(&patient).Error
+	return patient, err
+}
 
 func GetLastHisPatient(patient_id int64, org_id int64) (his models.HisPatient, err error) {
 	err = XTReadDB().Model(&models.HisPatient{}).Where("user_org_id = ? AND patient_id = ? and status = 1 AND patient_info <> ''", org_id, patient_id).First(&his).Error
@@ -758,3 +763,9 @@ func GetNewAdminUserES(orgID int64) (es []*models.AdminUserElectronicSignature,
 	err = readUserDb.Model(&models.AdminUserElectronicSignature{}).Where("org_id=?  and status=1", orgID).Find(&es).Error
 	return
 }
+
+func GetPatientVascularAccess(patient_id int64) (models.XtPatientVascularAccess, error) {
+	access := models.XtPatientVascularAccess{}
+	err = XTReadDB().Where("patient_id = ? and status = 1", patient_id).Last(&access).Error
+	return access, err
+}

service/his_service.go

@@ -514,6 +514,21 @@ func GetSettleHisPrescription(org_id int64, patient_id int64, his_patient_id int
 		Find(&prescription).Error
 	return
 }
+func GetSettleHisPrescriptionTX(org_id int64, patient_id int64, his_patient_id int64, record_date int64, med_type int64, tx *gorm.DB) (prescription []*models.HisPrescription, err error) {
+	err = tx.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND his_patient_id = ? AND p_type <> 1 AND med_type = ?", org_id, record_date, patient_id, his_patient_id, med_type).
+		Find(&prescription).Error
+	return
+}
 
 func GetMonthHisPrescription(org_id int64, patient_id int64, start_date int64, end_date int64, med_type int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
@@ -530,6 +545,21 @@ func GetMonthHisPrescription(org_id int64, patient_id int64, start_date int64, e
 		Find(&prescription).Error
 	return
 }
+func GetMonthHisPrescriptionTX(org_id int64, patient_id int64, start_date int64, end_date int64, med_type int64, tx *gorm.DB) (prescription []*models.HisPrescription, err error) {
+	err = tx.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1").Preload("XtHisProjectTeam", "status = 1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1 AND med_type = ?", org_id, start_date, end_date, patient_id, med_type).
+		Find(&prescription).Error
+	return
+}
 
 func GetMonthHisPrescriptionTwo(org_id int64, patient_id int64, start_date int64, end_date int64, p_type int64) (prescription []*models.HisPrescription, err error) {
 	err = readDb.Model(&models.HisPrescription{}).
@@ -842,11 +872,19 @@ func CreateOrder(order *models.HisOrder) (err error) {
 	err = writeDb.Create(&order).Error
 	return
 }
+func CreateOrderTX(order *models.HisOrder, tx *gorm.DB) (err error) {
+	err = tx.Create(&order).Error
+	return
+}
 
 func CreateOrderInfo(order *models.HisOrderInfo) (err error) {
 	err = writeDb.Create(&order).Error
 	return
 }
+func CreateOrderInfoTX(order *models.HisOrderInfo, tx *gorm.DB) (err error) {
+	err = tx.Create(&order).Error
+	return
+}
 
 func FindPatientPrescriptionInfo(org_id int64, patient_id int64, record_date int64, p_type int64, his_patient_id int64) (info models.HisPrescriptionInfo, err error) {
 	err = readDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND p_type = ? AND his_patient_id = ? ", org_id, record_date, patient_id, p_type, his_patient_id).First(&info).Error
@@ -966,6 +1004,10 @@ func UpDatePrescriptionNumber(user_org_id int64, ids []int64, number string) (er
 	err = writeDb.Model(&models.HisPrescription{}).Where("user_org_id = ? AND status = 1 AND id in (?)", user_org_id, ids).Updates(map[string]interface{}{"batch_number": number, "mtime": time.Now().Unix()}).Error
 	return
 }
+func UpDatePrescriptionNumberTX(user_org_id int64, ids []int64, number string, tx *gorm.DB) (err error) {
+	err = tx.Model(&models.HisPrescription{}).Where("user_org_id = ? AND status = 1 AND id in (?)", user_org_id, ids).Updates(map[string]interface{}{"batch_number": number, "mtime": time.Now().Unix()}).Error
+	return
+}
 
 func UpDateAddtionNumber(user_org_id int64, ids []int64, number string) (err error) {
 	err = writeDb.Model(&models.HisAdditionalCharge{}).Where("user_org_id = ? AND status = 1 AND id in (?)", user_org_id, ids).Updates(map[string]interface{}{"batch_number": number, "mtime": time.Now().Unix()}).Error
@@ -983,6 +1025,11 @@ func UpDateHisPrescriptionInfoNumber(user_org_id int64, id int64, number string,
 
 	return
 }
+func UpDateHisPrescriptionInfoNumberTX(user_org_id int64, id int64, number string, record_time int64, his_patient_id int64, tx *gorm.DB) (err error) {
+	err = tx.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1 AND his_patient_id = ? AND record_date = ?", user_org_id, his_patient_id, record_time).Updates(map[string]interface{}{"batch_number": number, "prescription_status": 3, "mtime": time.Now().Unix()}).Error
+
+	return
+}
 
 func UpDateHospitalHisPrescriptionInfoNumber(user_org_id int64, number string, start_time int64, end_time int64) (err error) {
 	err = writeDb.Model(&models.HisPrescriptionInfo{}).Where("user_org_id = ? AND status = 1  AND record_date <= ? AND record_date >= ? ", user_org_id, end_time, start_time).Updates(map[string]interface{}{"batch_number": number, "prescription_status": 3, "mtime": time.Now().Unix()}).Error
@@ -1208,6 +1255,11 @@ func UpdataOrderStatusTwo(number string, user_org_id int64) (err 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": 3, "mtime": time.Now().Unix()}).Error
 	return
 }
+func UpdataOrderStatusTwoTX(number string, user_org_id int64, tx *gorm.DB) (err error) {
+	err = tx.Model(&models.HisPrescription{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"order_status": 2, "mtime": time.Now().Unix()}).Error
+	err = tx.Model(&models.HisPrescriptionInfo{}).Where("status = 1 AND batch_number = ? AND user_org_id = ?", number, user_org_id).Updates(map[string]interface{}{"prescription_status": 3, "mtime": time.Now().Unix()}).Error
+	return
+}
 
 func CreateErrMsgLog(log *models.HisOrderError) {
 	writeDb.Model(&models.HisOrderError{}).Create(&log)
@@ -1438,6 +1490,10 @@ func GetHisOrderByID(order_id int64) (order models.HisOrder, err error) {
 	err = readDb.Model(&models.HisOrder{}).Where("id = ? AND status = 1", order_id).First(&order).Error
 	return
 }
+func GetHisOrderByIDTX(order_id int64, tx *gorm.DB) (order models.HisOrder, err error) {
+	err = tx.Model(&models.HisOrder{}).Where("id = ? AND status = 1", order_id).First(&order).Error
+	return
+}
 
 func GetHisOrderInfoByNumber(order_number string) (order []*models.HisOrderInfo, err error) {
 	err = readDb.Model(&models.HisOrderInfo{}).Where("order_number = ? AND status = 1", order_number).Find(&order).Error
@@ -2243,7 +2299,9 @@ func GetChargeMonthHisPrescriptionFive(org_id int64, patient_id int64, order_num
 
 func UpdataHisPateint(his *models.HisPatient) {
 	writeDb.Save(&his)
-
+}
+func UpdataHisPateintTX(his *models.HisPatient, tx *gorm.DB) {
+	tx.Save(&his)
 }
 
 func SaveHisOrder(his *models.HisOrder) (err error) {
@@ -2269,6 +2327,24 @@ func GetPrescriptionByIds(ids []string, org_id int64) (prescription []*models.Hi
 
 	return
 }
+func GetPrescriptionByIdsTX(ids []string, org_id int64, tx *gorm.DB) (prescription []*models.HisPrescription, err error) {
+	err = tx.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("Drug", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(tx *gorm.DB) *gorm.DB {
+			return tx.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject").Preload("GoodInfo", "status=1")
+		}).Preload("TempHisOrder", func(tx *gorm.DB) *gorm.DB {
+		return tx.Where("status = 1 AND user_org_id = ?", org_id)
+	}).
+		Where("id in (?) AND user_org_id = ? AND status = 1", ids, org_id).
+		Find(&prescription).Error
+
+	return
+}
 
 func GetNewAllUnChargeHisPatientListTwo(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)

service/schedule_service.go

@@ -1154,3 +1154,9 @@ func GetSolutionScheduleBySchedule(orgid int64, zonid int64, classtype int64, sc
 	}).Find(&schedule).Error
 	return schedule, err
 }
+
+func GetDeathPatient(orgid int64) (patient []*models.XtPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and (lapseto = 2 || lapseto = 3) and status = 1", orgid).Find(&patient).Error
+	return patient, err
+}

service/self_drug_service.go

@@ -547,6 +547,10 @@ type Drugs struct {
 	HospApprFlag          int64    `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
 	LmtUsedFlag           int64    `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
 	PrescribingNumberUnit string   `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	MinNumber             int64    `gorm:"column:min_number" json:"min_number" form:"min_number"`
+	Dose                  float64  `gorm:"column:dose" json:"dose" form:"dose"`
+	DoseUnit              string   `gorm:"column:dose_unit" json:"dose_unit" form:"dose_unit"`
+	MaxUnit               string   `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
 }
 
 func (Drugs) TableName() string {