提交代码

controllers/his_charge_api_controller.go

@@ -30,12 +30,12 @@ func HisChargeApiRegistRouters() {
 	beego.Router("/api/his/inspectioninfo/get", &HisChargeApiController{}, "get:GetHisInspectionInfo")
 
 	//发票
-	beego.Router("/api/fapiao/create", &HisChargeApiController{}, "post:CreateFaPiaoRecord")
-	beego.Router("/api/fapiao/modify", &HisChargeApiController{}, "post:ModifyFaPiaoRecord")
-	beego.Router("/api/fapiao/list", &HisChargeApiController{}, "get:GetFaPiaoRecordList")
-	beego.Router("/api/fapiao/delete", &HisChargeApiController{}, "post:DeleteFaPiaoRecord")
-	beego.Router("/api/fapiao", &HisChargeApiController{}, "get:GetFaPiaoRecord")
-	beego.Router("/api/fapiao/is_use", &HisChargeApiController{}, "post:UpdateFaPiaoRecordIsUse")
+	beego.Router("/api/bwfapiao/create", &HisChargeApiController{}, "post:CreateFaPiaoRecord")
+	beego.Router("/api/bwfapiao/modify", &HisChargeApiController{}, "post:ModifyFaPiaoRecord")
+	beego.Router("/api/bwfapiao/list", &HisChargeApiController{}, "get:GetFaPiaoRecordList")
+	beego.Router("/api/bwfapiao/delete", &HisChargeApiController{}, "post:DeleteFaPiaoRecord")
+	beego.Router("/api/bwfapiao", &HisChargeApiController{}, "get:GetFaPiaoRecord")
+	beego.Router("/api/bwfapiao/is_use", &HisChargeApiController{}, "post:UpdateFaPiaoRecordIsUse")
 	beego.Router("/api/his/getyidiclear", &HisChargeApiController{}, "get:GetHisYidiClearRecord")
 	beego.Router("/api/his/getexportdata", &HisChargeApiController{}, "get:GetExportData")
 
@@ -443,19 +443,19 @@ func (c *HisChargeApiController) GetPrescriptionStatisticsDetail() {
 	patient_id, _ := c.GetInt64("patient_id")
 	item_type, _ := c.GetInt64("type")
 
-	date1, _ := time.Parse("2006-01-02", start_time)
-	date2, _ := time.Parse("2006-01-02", end_time)
+	//date1, _ := time.Parse("2006-01-02", start_time)
+	//date2, _ := time.Parse("2006-01-02", end_time)
 	// 计算日期间隔
-	duration := date2.Sub(date1)
+	//duration := date2.Sub(date1)
 
 	// 一个月的时间跨度为30天 * 24小时 * 60分钟 * 60秒
-	oneMonthDuration := 30 * 24 * time.Hour
+	//oneMonthDuration := 30 * 24 * time.Hour
 
-	if duration <= oneMonthDuration {
-	} else {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorTimeCodeParamWrong)
-		return
-	}
+	//if duration <= oneMonthDuration {
+	//} else {
+	//	c.ServeFailJSONWithSGJErrorCode(enums.ErrorTimeCodeParamWrong)
+	//	return
+	//}
 	adminUser := c.GetAdminUserInfo()
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -543,6 +543,10 @@ func (c *HisChargeApiController) GetChargeStatisticsSettle() {
 	end_time := c.GetString("end_time")
 	keyword := c.GetString("keyword")
 	item_type, _ := c.GetInt64("type")
+	s_type, _ := c.GetInt64("s_type")
+	limit, _ := c.GetInt64("limit")
+	page, _ := c.GetInt64("page")
+
 	adminUser := c.GetAdminUserInfo()
 
 	timeLayout := "2006-01-02"
@@ -559,14 +563,24 @@ func (c *HisChargeApiController) GetChargeStatisticsSettle() {
 	}
 	endRecordDateTime := endTime.Unix()
 
-	chargePatient, err := service.GetAllPatientChargeSettle(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime, keyword, item_type)
+	var chargePatient []*models.SettlePatient
+	var total int64
+	var err2 error
+	if s_type == 1 {
+		chargePatient, total, err2 = service.GetAllPatientChargeSettle(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime, keyword, item_type, limit, page)
+
+	} else {
+		chargePatient, err2 = service.GetAllPatientChargeSettleTwo(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime, keyword, item_type)
+
+	}
 	sick, _, _ := service.FindAllMZSickList(adminUser.CurrentOrgId, 1, 10000)
 	config, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
 
-	if err == nil {
+	if err2 == nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"patients": chargePatient,
 			"config":   config,
+			"total":    total,
 			"sick":     sick,
 		})
 		return