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

controllers/his_charge_api_controller.go

@@ -8,6 +8,7 @@ import (
 	"bytes"
 	"compress/gzip"
 	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
 	"net/http"
 	"time"
@@ -238,6 +239,8 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 	keyword := c.GetString("keyword")
 	item_type, _ := c.GetInt64("type")
 
+	s_type, _ := c.GetInt64("s_type")
+
 	adminUser := c.GetAdminUserInfo()
 
 	timeLayout := "2006-01-02"
@@ -254,84 +257,26 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 	}
 	endRecordDateTime := endTime.Unix()
 
-	switch item_type {
-	case 0:
-		chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
-		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
-		chargeDrug = append(chargeDrug, chargeProject...)
-		b, _ := structToBytes(chargeDrug)
-		//cd, _ := compressData(b)
-		// 使用 Gzip 压缩数据
-		var compressedData bytes.Buffer
-		writer := gzip.NewWriter(&compressedData)
-		_, err = writer.Write(b)
-		if err != nil {
-			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
-			c.Ctx.WriteString(err.Error())
-			return
+	if s_type > 0 {
+		type NewDate struct {
+			Patients []*models.NewChargeDetail
+			Results  []service.MedicalChargesTwo
 		}
-		writer.Close()
+		reuslt, _ := service.GetHisOrderSummary(adminUser.CurrentOrgId, start_time, end_time)
+		fmt.Println(reuslt)
+		chargeDrug, _ := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+		chargeProject, _ := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+		chargeDrug = append(chargeDrug, chargeProject...)
 
-		// 设置响应头，表明数据经过了 Gzip 压缩
-		c.Ctx.Output.Header("Content-Encoding", "gzip")
-		// 发送压缩后的数据
-		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
-		break
-	case 1:
-		chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
-		//chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
-		//chargeDrug = append(chargeDrug, chargeProject...)
-		b, _ := structToBytes(chargeDrug)
-		//cd, _ := compressData(b)
-		// 使用 Gzip 压缩数据
-		var compressedData bytes.Buffer
-		writer := gzip.NewWriter(&compressedData)
-		_, err = writer.Write(b)
-		if err != nil {
-			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
-			c.Ctx.WriteString(err.Error())
-			return
-		}
-		writer.Close()
+		var dd NewDate
+		dd.Results = reuslt
+		dd.Patients = chargeDrug
 
-		// 设置响应头，表明数据经过了 Gzip 压缩
-		c.Ctx.Output.Header("Content-Encoding", "gzip")
-		// 发送压缩后的数据
-		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
-		break
-	case 2:
-		//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
-		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
-		//chargeDrug = append(chargeDrug, chargeProject...)
-		b, _ := structToBytes(chargeProject)
-		//cd, _ := compressData(b)
-		// 使用 Gzip 压缩数据
-		var compressedData bytes.Buffer
-		writer := gzip.NewWriter(&compressedData)
-		_, err = writer.Write(b)
-		if err != nil {
-			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
-			c.Ctx.WriteString(err.Error())
-			return
-		}
-		writer.Close()
+		data, _ := json.Marshal(dd)
 
-		// 设置响应头，表明数据经过了 Gzip 压缩
-		c.Ctx.Output.Header("Content-Encoding", "gzip")
-		// 发送压缩后的数据
-		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
-		break
-
-	case 3:
-		//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
-		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
-		//chargeDrug = append(chargeDrug, chargeProject...)
-		b, _ := structToBytes(chargeProject)
-		//cd, _ := compressData(b)
-		// 使用 Gzip 压缩数据
 		var compressedData bytes.Buffer
 		writer := gzip.NewWriter(&compressedData)
-		_, err = writer.Write(b)
+		_, err = writer.Write(data)
 		if err != nil {
 			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
 			c.Ctx.WriteString(err.Error())
@@ -343,95 +288,190 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
 		c.Ctx.Output.Header("Content-Encoding", "gzip")
 		// 发送压缩后的数据
 		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
-		break
-	case 4:
-		//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
-		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
-		//chargeDrug = append(chargeDrug, chargeProject...)
-		b, _ := structToBytes(chargeProject)
-		//cd, _ := compressData(b)
-		// 使用 Gzip 压缩数据
-		var compressedData bytes.Buffer
-		writer := gzip.NewWriter(&compressedData)
-		_, err = writer.Write(b)
-		if err != nil {
-			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
-			c.Ctx.WriteString(err.Error())
-			return
-		}
-		writer.Close()
-
-		// 设置响应头，表明数据经过了 Gzip 压缩
-		c.Ctx.Output.Header("Content-Encoding", "gzip")
-		// 发送压缩后的数据
-		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
-		break
-	case 5:
-		//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
-		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
-		//chargeDrug = append(chargeDrug, chargeProject...)
-		b, _ := structToBytes(chargeProject)
-		//cd, _ := compressData(b)
-		// 使用 Gzip 压缩数据
-		var compressedData bytes.Buffer
-		writer := gzip.NewWriter(&compressedData)
-		_, err = writer.Write(b)
-		if err != nil {
-			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
-			c.Ctx.WriteString(err.Error())
-			return
-		}
-		writer.Close()
+		//b, _ := structToBytes(data)
 
-		// 设置响应头，表明数据经过了 Gzip 压缩
-		c.Ctx.Output.Header("Content-Encoding", "gzip")
-		// 发送压缩后的数据
-		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
-		break
-	case 6:
-		//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
-		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
-		//chargeDrug = append(chargeDrug, chargeProject...)
-		b, _ := structToBytes(chargeProject)
-		//cd, _ := compressData(b)
-		// 使用 Gzip 压缩数据
-		var compressedData bytes.Buffer
-		writer := gzip.NewWriter(&compressedData)
-		_, err = writer.Write(b)
-		if err != nil {
-			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
-			c.Ctx.WriteString(err.Error())
-			return
-		}
-		writer.Close()
+	} else {
+		switch item_type {
+		case 0:
+			reuslt, _ := service.GetHisOrderSummary(adminUser.CurrentOrgId, start_time, end_time)
+			fmt.Println(reuslt)
+			chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+			chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+			chargeDrug = append(chargeDrug, chargeProject...)
+			b, _ := structToBytes(chargeDrug)
+			//cd, _ := compressData(b)
+			// 使用 Gzip 压缩数据
+			var compressedData bytes.Buffer
+			writer := gzip.NewWriter(&compressedData)
+			_, err = writer.Write(b)
+			if err != nil {
+				c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+				c.Ctx.WriteString(err.Error())
+				return
+			}
+			writer.Close()
+
+			// 设置响应头，表明数据经过了 Gzip 压缩
+			c.Ctx.Output.Header("Content-Encoding", "gzip")
+			// 发送压缩后的数据
+			c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+			break
+		case 1:
+			chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+			//chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+			//chargeDrug = append(chargeDrug, chargeProject...)
+			b, _ := structToBytes(chargeDrug)
+			//cd, _ := compressData(b)
+			// 使用 Gzip 压缩数据
+			var compressedData bytes.Buffer
+			writer := gzip.NewWriter(&compressedData)
+			_, err = writer.Write(b)
+			if err != nil {
+				c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+				c.Ctx.WriteString(err.Error())
+				return
+			}
+			writer.Close()
+
+			// 设置响应头，表明数据经过了 Gzip 压缩
+			c.Ctx.Output.Header("Content-Encoding", "gzip")
+			// 发送压缩后的数据
+			c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+			break
+		case 2:
+			//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+			chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+			//chargeDrug = append(chargeDrug, chargeProject...)
+			b, _ := structToBytes(chargeProject)
+			//cd, _ := compressData(b)
+			// 使用 Gzip 压缩数据
+			var compressedData bytes.Buffer
+			writer := gzip.NewWriter(&compressedData)
+			_, err = writer.Write(b)
+			if err != nil {
+				c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+				c.Ctx.WriteString(err.Error())
+				return
+			}
+			writer.Close()
+
+			// 设置响应头，表明数据经过了 Gzip 压缩
+			c.Ctx.Output.Header("Content-Encoding", "gzip")
+			// 发送压缩后的数据
+			c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+			break
+		case 3:
+			//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+			chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+			//chargeDrug = append(chargeDrug, chargeProject...)
+			b, _ := structToBytes(chargeProject)
+			//cd, _ := compressData(b)
+			// 使用 Gzip 压缩数据
+			var compressedData bytes.Buffer
+			writer := gzip.NewWriter(&compressedData)
+			_, err = writer.Write(b)
+			if err != nil {
+				c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+				c.Ctx.WriteString(err.Error())
+				return
+			}
+			writer.Close()
+
+			// 设置响应头，表明数据经过了 Gzip 压缩
+			c.Ctx.Output.Header("Content-Encoding", "gzip")
+			// 发送压缩后的数据
+			c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+			break
+		case 4:
+			//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+			chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+			//chargeDrug = append(chargeDrug, chargeProject...)
+			b, _ := structToBytes(chargeProject)
+			//cd, _ := compressData(b)
+			// 使用 Gzip 压缩数据
+			var compressedData bytes.Buffer
+			writer := gzip.NewWriter(&compressedData)
+			_, err = writer.Write(b)
+			if err != nil {
+				c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+				c.Ctx.WriteString(err.Error())
+				return
+			}
+			writer.Close()
+
+			// 设置响应头，表明数据经过了 Gzip 压缩
+			c.Ctx.Output.Header("Content-Encoding", "gzip")
+			// 发送压缩后的数据
+			c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+			break
+		case 5:
+			//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+			chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+			//chargeDrug = append(chargeDrug, chargeProject...)
+			b, _ := structToBytes(chargeProject)
+			//cd, _ := compressData(b)
+			// 使用 Gzip 压缩数据
+			var compressedData bytes.Buffer
+			writer := gzip.NewWriter(&compressedData)
+			_, err = writer.Write(b)
+			if err != nil {
+				c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+				c.Ctx.WriteString(err.Error())
+				return
+			}
+			writer.Close()
+
+			// 设置响应头，表明数据经过了 Gzip 压缩
+			c.Ctx.Output.Header("Content-Encoding", "gzip")
+			// 发送压缩后的数据
+			c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+			break
+		case 6:
+			//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+			chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+			//chargeDrug = append(chargeDrug, chargeProject...)
+			b, _ := structToBytes(chargeProject)
+			//cd, _ := compressData(b)
+			// 使用 Gzip 压缩数据
+			var compressedData bytes.Buffer
+			writer := gzip.NewWriter(&compressedData)
+			_, err = writer.Write(b)
+			if err != nil {
+				c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+				c.Ctx.WriteString(err.Error())
+				return
+			}
+			writer.Close()
+
+			// 设置响应头，表明数据经过了 Gzip 压缩
+			c.Ctx.Output.Header("Content-Encoding", "gzip")
+			// 发送压缩后的数据
+			c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+			break
+		case 7:
+			//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
+			chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
+			//chargeDrug = append(chargeDrug, chargeProject...)
+			b, _ := structToBytes(chargeProject)
+			//cd, _ := compressData(b)
+			// 使用 Gzip 压缩数据
+			var compressedData bytes.Buffer
+			writer := gzip.NewWriter(&compressedData)
+			_, err = writer.Write(b)
+			if err != nil {
+				c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
+				c.Ctx.WriteString(err.Error())
+				return
+			}
+			writer.Close()
+
+			// 设置响应头，表明数据经过了 Gzip 压缩
+			c.Ctx.Output.Header("Content-Encoding", "gzip")
+			// 发送压缩后的数据
+			c.Ctx.ResponseWriter.Write(compressedData.Bytes())
+			break
 
-		// 设置响应头，表明数据经过了 Gzip 压缩
-		c.Ctx.Output.Header("Content-Encoding", "gzip")
-		// 发送压缩后的数据
-		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
-		break
-	case 7:
-		//chargeDrug, err := service.GetNewAllPatientDrugChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type)
-		chargeProject, err := service.GetNewAllPatientProjectAndGoodChargeDetails(adminUser.CurrentOrgId, start_time+" 00:00:00", end_time+" 23:59:59", startRecordDateTime, endRecordDateTime, keyword, item_type, time_type)
-		//chargeDrug = append(chargeDrug, chargeProject...)
-		b, _ := structToBytes(chargeProject)
-		//cd, _ := compressData(b)
-		// 使用 Gzip 压缩数据
-		var compressedData bytes.Buffer
-		writer := gzip.NewWriter(&compressedData)
-		_, err = writer.Write(b)
-		if err != nil {
-			c.Ctx.ResponseWriter.WriteHeader(http.StatusInternalServerError)
-			c.Ctx.WriteString(err.Error())
-			return
 		}
-		writer.Close()
-
-		// 设置响应头，表明数据经过了 Gzip 压缩
-		c.Ctx.Output.Header("Content-Encoding", "gzip")
-		// 发送压缩后的数据
-		c.Ctx.ResponseWriter.Write(compressedData.Bytes())
-		break
 
 	}
 

controllers/new_stock_api_controller.go

@@ -169,6 +169,7 @@ func (this *NewStockApiController) GetHisDrugCodeQuery() {
 	page, _ := this.GetInt64("page")
 	is_sale, _ := this.GetInt64("is_sale")
 	is_settle, _ := this.GetInt64("is_settle")
+	is_code, _ := this.GetInt64("is_code")
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
 	timeLayout := "2006-01-02"
@@ -193,7 +194,7 @@ func (this *NewStockApiController) GetHisDrugCodeQuery() {
 		endTime = theTime.Unix()
 	}
 
-	list, total, _ := service.GetHisDrugCodeQuery(orgId, startTime, endTime, limit, page, is_sale, is_settle, keywords)
+	list, total, _ := service.GetHisDrugCodeQuery(orgId, startTime, endTime, limit, page, is_sale, is_settle, keywords, is_code)
 
 	drug, _ := service.GetAllDrugList(orgId)
 

service/export_data_service.go

@@ -393,3 +393,42 @@ func GetHisOrderBy10697SummaryTwo(startTime, endTime, ins string, st_stamp, end_
 
 	return results, nil
 }
+
+type MedicalChargesTwo struct {
+	TotalMedicalFee float64 `gorm:"column:医疗费总额"`     // 医疗费总额
+	Fund            float64 `gorm:"column:基金支付总金额"`   // 个人自付金额
+	AcctPay         float64 `gorm:"column:个人账户支付总金额"` // 基本账户支付
+	PsnPay          float64 `gorm:"column:个人自付总金额"`   // 基本账户支付
+	PoolFundPay     float64 `gorm:"column:基金统筹总金额"`   // 统筹支付金额
+	DaE             float64 `gorm:"column:大额支付总金额"`   // 统筹支付金额
+	XianXing        float64 `gorm:"column:先行自付总金额"`   // 统筹支付金额
+	QuanZiFei       float64 `gorm:"column:全自费总金额"`    // 统筹支付金额
+	YiLiaoJiuZhu    float64 `gorm:"column:医疗救助基金总额"`  // 统筹支付金额
+	DaBing          float64 `gorm:"column:大病基金总额"`    // 统筹支付金额
+	GongWuYuan      float64 `gorm:"column:公务员补助"`     // 统筹支付金额
+	QiYe            float64 `gorm:"column:企业补充支付"`    // 统筹支付金额
+	QiTa            float64 `gorm:"column:其它支付"`      // 统筹支付金额
+}
+
+func GetHisOrderSummary(org_id int64, start_time string, end_time string) (results []MedicalChargesTwo, err error) {
+	err = readDb.Table("his_order").
+		Select(`
+        SUM(his_order.medfee_sumamt) AS 医疗费总额,
+        SUM(his_order.fund_pay_sumamt) AS 基金支付总金额,
+        SUM(his_order.acct_pay) AS 个人账户支付总金额,
+        SUM(his_order.psn_cash_pay) AS 个人自付总金额,
+        SUM(his_order.hifp_pay) AS 基金统筹总金额,
+        SUM(his_order.hifob_pay) AS 大额支付总金额,
+        SUM(his_order.preselfpay_amt) AS 先行自付总金额,
+        SUM(his_order.fulamt_ownpay_amt) AS 全自费总金额,
+        SUM(his_order.maf_pay) AS 医疗救助基金总额,
+        SUM(his_order.hifmi_pay) AS 大病支付,
+        SUM(his_order.cvlserv_pay) AS 公务员补助,
+        SUM(his_order.hifes_pay) AS 企业补充支付,
+        SUM(his_order.oth_pay) AS 其它支付
+    `).
+		Where("his_order.user_org_id = ? AND his_order.order_status = ? AND his_order.setl_time >= ? AND his_order.setl_time <= ?  AND his_order.STATUS = ?",
+			org_id, 2, start_time+" 00:00:00", end_time+" 23:59:59", 1).
+		Scan(&results).Error
+	return
+}

service/his_charge_service.go

@@ -712,14 +712,14 @@ func GetAllPatientChargeSettleTwo(org_id int64, start_time int64, end_time int64
 
 			break
 		case 5:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 AND orders.insutype = 390", start_time, end_time, org_id).Preload("TempDialysisOrder", "status = 1 and dialysis_date >= ? and dialysis_date <= ?", start_time, end_time).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Preload("OrderSchedule", "status = 1 and user_org_id = ?", org_id).Preload("OrderHisPatient", "status = 1").Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 ", start_time, end_time, org_id).Order("ctime")
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 AND orders.insutype = 390 and is_medicine_insurance = 1", start_time, end_time, org_id).Preload("TempDialysisOrder", "status = 1 and dialysis_date >= ? and dialysis_date <= ?", start_time, end_time).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Preload("OrderSchedule", "status = 1 and user_org_id = ?", org_id).Preload("OrderHisPatient", "status = 1").Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 and is_medicine_insurance = 1", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break
 		case 6:
-			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 AND orders.insutype = 310 ", start_time, end_time, org_id).Preload("TempDialysisOrder", "status = 1 and dialysis_date >= ? and dialysis_date <= ?", start_time, end_time).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
-				return db.Preload("OrderSchedule", "status = 1 and user_org_id = ?", org_id).Preload("OrderHisPatient", "status = 1").Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id).Order("ctime")
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status,p.id_card_no").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.ctime >= ? AND orders.ctime <= ? AND orders.user_org_id = ? AND orders.order_status = 2 AND orders.insutype = 310 and is_medicine_insurance = 1", start_time, end_time, org_id).Preload("TempDialysisOrder", "status = 1 and dialysis_date >= ? and dialysis_date <= ?", start_time, end_time).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
+				return db.Preload("OrderSchedule", "status = 1 and user_org_id = ?", org_id).Preload("OrderHisPatient", "status = 1").Where("status = 1  AND ctime >= ? AND ctime <= ? AND user_org_id = ? AND order_status = 2 and is_medicine_insurance = 1", start_time, end_time, org_id).Order("ctime")
 			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
 
 			break

service/stock_service.go

@@ -11019,7 +11019,7 @@ func SaveDrugOpen(open models.XtDrugCodeOpen) error {
 	return err
 }
 
-func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit int64, page int64, is_sale int64, is_settle int64, keywords string) (list []*models.NewHisDoctorAdviceInfo, total int64, err error) {
+func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit int64, page int64, is_sale int64, is_settle int64, keywords string, is_code int64) (list []*models.NewHisDoctorAdviceInfo, total int64, err error) {
 
 	db := XTReadDB().Model(&models.NewHisDoctorAdviceInfo{}).Preload("NewHisPrescription", "status = 1").Where("his_doctor_advice_info.status=1")
 	if is_settle == 2 {
@@ -11028,6 +11028,16 @@ func GetHisDrugCodeQuery(orgId int64, start_time int64, end_time int64, limit in
 	} else if is_settle == 1 {
 		db = db.Joins("join his_prescription on his_prescription.id = his_doctor_advice_info.prescription_id and his_prescription.order_status <> 2 and his_prescription.status = 1")
 	}
+	if is_code == 2 {
+		//db = db.Joins("join his_prescription on his_prescription.id = his_doctor_advice_info.prescription_id and his_prescription.order_status = 2 and his_prescription.status = 1")
+
+		db = db.Where("his_doctor_advice_info.drug_code <> ''")
+
+	} else if is_code == 1 {
+
+		db = db.Where("length(his_doctor_advice_info.drug_code) = 0")
+
+	}
 
 	if len(keywords) > 0 {
 		keywords = "%" + keywords + "%"