Browse Source

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

XMLWAN 3 years ago
parent
commit
8eeff6c5f2

+ 9 - 3
conf/app.conf View File

@@ -1,6 +1,6 @@
1 1
 appname = 血透
2 2
 httpport = 9531
3
-runmode = dev
3
+runmode = prod
4 4
 
5 5
 #
6 6
 copyrequestbody = true
@@ -56,6 +56,14 @@ readmysqluser = syh
56 56
 readmysqlpass = xhPECP2nFObR8aUK
57 57
 readmysqlname = sgj_xt
58 58
 
59
+
60
+
61
+readmysqlhost2 = rr-kuyicloud.mysql.rds.aliyuncs.com
62
+readmysqlport2 = 3306
63
+readmysqluser2 = syh
64
+readmysqlpass2 = xhPECP2nFObR8aUK
65
+readmysqlname2 = sgj_xt
66
+
59 67
 writemysqlhost = shengws1.mysql.rds.aliyuncs.com
60 68
 writemysqlport = 3306
61 69
 writemysqluser = syh
@@ -173,7 +181,6 @@ writeuserpass = 1Q2W3e4r!@#$
173 181
 writeusername = sgj_users
174 182
 
175 183
 
176
-
177 184
 readmiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
178 185
 readmiddleport = 3306
179 186
 readmiddleuser = root
@@ -187,7 +194,6 @@ writemiddlepass = 1Q2W3e4r!@#$
187 194
 writemiddlename = ky_xt_middle
188 195
 
189 196
 
190
-
191 197
 readpatienthost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
192 198
 readpatientport = 3306
193 199
 readpatientuser = root

+ 2 - 2
controllers/his_api_controller.go View File

@@ -1879,7 +1879,7 @@ func (c *HisApiController) setProjectWithJSONTwo(project *models.HisPrescription
1879 1879
 
1880 1880
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
1881 1881
 		total, _ := json["total"].(string)
1882
-		totals, _ := strconv.ParseFloat(total, 64)
1882
+		totals, _ := strconv.ParseInt(total, 10, 64)
1883 1883
 		project.Count = totals
1884 1884
 	}
1885 1885
 
@@ -2253,7 +2253,7 @@ func (c *HisApiController) setProjectWithJSON(project *models.HisPrescriptionPro
2253 2253
 
2254 2254
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
2255 2255
 		total, _ := json["total"].(string)
2256
-		totals, _ := strconv.ParseFloat(total, 64)
2256
+		totals, _ := strconv.ParseInt(total, 10, 64)
2257 2257
 		project.Count = totals
2258 2258
 	}
2259 2259
 

+ 7 - 2
controllers/his_charge_api_controller.go View File

@@ -20,6 +20,9 @@ func HisChargeApiRegistRouters() {
20 20
 func (c *HisChargeApiController) GetChargeStatisticsDetail() {
21 21
 	start_time := c.GetString("start_time")
22 22
 	end_time := c.GetString("end_time")
23
+	keyword := c.GetString("keyword")
24
+	item_type, _ := c.GetInt64("type")
25
+
23 26
 	adminUser := c.GetAdminUserInfo()
24 27
 
25 28
 	timeLayout := "2006-01-02"
@@ -36,7 +39,7 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
36 39
 	}
37 40
 	endRecordDateTime := endTime.Unix()
38 41
 
39
-	chargePatient, err := service.GetAllPatientChargeDetails(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
42
+	chargePatient, err := service.GetAllPatientChargeDetails(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime, keyword, item_type)
40 43
 
41 44
 	if err == nil {
42 45
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -54,6 +57,8 @@ func (c *HisChargeApiController) GetChargeStatisticsDetail() {
54 57
 func (c *HisChargeApiController) GetChargeStatisticsSettle() {
55 58
 	start_time := c.GetString("start_time")
56 59
 	end_time := c.GetString("end_time")
60
+	keyword := c.GetString("keyword")
61
+	item_type, _ := c.GetInt64("type")
57 62
 	adminUser := c.GetAdminUserInfo()
58 63
 
59 64
 	timeLayout := "2006-01-02"
@@ -69,7 +74,7 @@ func (c *HisChargeApiController) GetChargeStatisticsSettle() {
69 74
 
70 75
 	}
71 76
 	endRecordDateTime := endTime.Unix()
72
-	chargePatient, err := service.GetAllPatientChargeSettle(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime)
77
+	chargePatient, err := service.GetAllPatientChargeSettle(adminUser.CurrentOrgId, startRecordDateTime, endRecordDateTime, keyword, item_type)
73 78
 	if err == nil {
74 79
 		c.ServeSuccessJSON(map[string]interface{}{
75 80
 			"patients": chargePatient,

+ 2 - 3
controllers/his_hospital_api_controller.go View File

@@ -135,11 +135,10 @@ func (c *HisHospitalApiController) GetHisHospitalChargePatientList() {
135 135
 	orders, _ := service.GetNewAllChargeHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime)
136 136
 	tempPatients, _ := service.GetNewAllUnChargeHisHospitalPatientList(adminInfo.CurrentOrgId, recordDateTime)
137 137
 
138
-	var patients []*service.HospitalPatient
138
+	var patients []*models.HisHospitalCheckRecord
139 139
 	for _, item := range tempPatients {
140 140
 		fmt.Println(item.ID)
141
-		if item.HisHospitalCheckRecord.ID > 0 && item.HisHospitalCheckRecord.InHospitalStatus == 1 &&
142
-			item.HisHospitalCheckRecord.HisHospitalOrder.ID == 0 {
141
+		if item.ID > 0 && item.InHospitalStatus == 1 && item.HisHospitalOrder.OrderStatus != 2 {
143 142
 			patients = append(patients, item)
144 143
 		}
145 144
 	}

+ 1 - 1
controllers/new_mobile_api_controllers/mobile_his_api_controller.go View File

@@ -1086,7 +1086,7 @@ func (c *MobileHisApiController) setProjectWithJSON(project *models.HisPrescript
1086 1086
 
1087 1087
 	if json["total"] != nil && reflect.TypeOf(json["total"]).String() == "string" {
1088 1088
 		total, _ := json["total"].(string)
1089
-		totals, _ := strconv.ParseFloat(total, 64)
1089
+		totals, _ := strconv.ParseInt(total, 10, 64)
1090 1090
 		project.Count = totals
1091 1091
 	}
1092 1092
 

+ 13 - 11
models/his_charge_models.go View File

@@ -1,14 +1,14 @@
1 1
 package models
2 2
 
3 3
 type HisChargePrescriptionProject struct {
4
-	ID         int64   `gorm:"column:id" json:"id" form:"id"`
5
-	ProjectId  int64   `gorm:"column:project_id" json:"project_id" form:"project_id"`
6
-	UserOrgId  int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
7
-	Status     int64   `gorm:"column:status" json:"status" form:"status"`
8
-	PatientId  int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
9
-	RecordDate int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
10
-	Count      float64 `gorm:"column:count" json:"count" form:"count"`
11
-	Type       int64   `gorm:"column:type" json:"type" form:"type"`
4
+	ID         int64 `gorm:"column:id" json:"id" form:"id"`
5
+	ProjectId  int64 `gorm:"column:project_id" json:"project_id" form:"project_id"`
6
+	UserOrgId  int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
7
+	Status     int64 `gorm:"column:status" json:"status" form:"status"`
8
+	PatientId  int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
9
+	RecordDate int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
10
+	Count      int64 `gorm:"column:count" json:"count" form:"count"`
11
+	Type       int64 `gorm:"column:type" json:"type" form:"type"`
12 12
 
13 13
 	HisChargeProject  HisChargeProject  `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"project"`
14 14
 	HisChargeGoodInfo HisChargeGoodInfo `gorm:"ForeignKey:ProjectId;AssociationForeignKey:ID" json:"good_info"`
@@ -25,6 +25,7 @@ type HisChargeDoctorAdviceInfo struct {
25 25
 	AdviceName string `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
26 26
 	Status     int64  `gorm:"column:status" json:"status" form:"status"`
27 27
 	DrugId     int64  `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
28
+	Drug       Drug   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
28 29
 }
29 30
 
30 31
 func (HisChargeDoctorAdviceInfo) TableName() string {
@@ -167,9 +168,10 @@ func (HisChargeProject) TableName() string {
167 168
 }
168 169
 
169 170
 type HisChargeGoodInfo struct {
170
-	ID       int64  `gorm:"column:id" json:"id" form:"id"`
171
-	GoodName string `gorm:"column:good_name" json:"good_name" form:"good_name"`
172
-	GoodUnit int64  `gorm:"column:good_unit" json:"good_unit"`
171
+	ID                 int64  `gorm:"column:id" json:"id" form:"id"`
172
+	GoodName           string `gorm:"column:good_name" json:"good_name" form:"good_name"`
173
+	GoodUnit           int64  `gorm:"column:good_unit" json:"good_unit"`
174
+	SpecificationnName string `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
173 175
 }
174 176
 
175 177
 func (HisChargeGoodInfo) TableName() string {

+ 1 - 1
models/his_models.go View File

@@ -749,7 +749,7 @@ type HisPrescriptionProject struct {
749 749
 	HisPatientId       int64      `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
750 750
 	RecordDate         int64      `gorm:"column:record_date" json:"record_date" form:"record_date"`
751 751
 	PrescriptionId     int64      `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
752
-	Count              float64    `gorm:"column:count" json:"count" form:"count"`
752
+	Count              int64      `gorm:"column:count" json:"count" form:"count"`
753 753
 	FeedetlSn          string     `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
754 754
 	MedListCodg        string     `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
755 755
 	SingleDose         string     `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`

+ 16 - 0
models/service/db.go View File

@@ -29,6 +29,8 @@ var writeDb *gorm.DB
29 29
 var readUserDb *gorm.DB
30 30
 var writeUserDb *gorm.DB
31 31
 
32
+var readDb2 *gorm.DB
33
+
32 34
 var readMiddleDb *gorm.DB
33 35
 var writeMiddleDb *gorm.DB
34 36
 
@@ -50,6 +52,12 @@ func ConnectDB() {
50 52
 	readPass := beego.AppConfig.String("readmysqlpass")
51 53
 	readName := beego.AppConfig.String("readmysqlname")
52 54
 
55
+	readHost2 := beego.AppConfig.String("readmysqlhost2")
56
+	readPort2 := beego.AppConfig.String("readmysqlport2")
57
+	readUser2 := beego.AppConfig.String("readmysqluser2")
58
+	readPass2 := beego.AppConfig.String("readmysqlpass2")
59
+	readName2 := beego.AppConfig.String("readmysqlname2")
60
+
53 61
 	writeHost := beego.AppConfig.String("writemysqlhost")
54 62
 	writePort := beego.AppConfig.String("writemysqlport")
55 63
 	writeUser := beego.AppConfig.String("writemysqluser")
@@ -117,6 +125,8 @@ func ConnectDB() {
117 125
 	writeUserNameT := beego.AppConfig.String("writeusernameTest")
118 126
 
119 127
 	rdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser, readPass, readHost, readPort, readName)
128
+	rdsn2 := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser2, readPass2, readHost2, readPort2, readName2)
129
+
120 130
 	wdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUser, writePass, writeHost, writePort, writeName)
121 131
 
122 132
 	rudsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUserUser, readUserPass, readUserHost, readUserPort, readUserName)
@@ -135,6 +145,8 @@ func ConnectDB() {
135 145
 	wudsnT := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUserUserT, writeUserPassT, writeUserHostT, writeUserPortT, writeUserNameT)
136 146
 
137 147
 	readDb, err = gorm.Open("mysql", rdsn)
148
+	readDb2, err = gorm.Open("mysql", rdsn2)
149
+
138 150
 	if err != nil {
139 151
 		//beego.Error(err)
140 152
 	}
@@ -142,6 +154,10 @@ func ConnectDB() {
142 154
 	readDb.DB().SetMaxOpenConns(100)
143 155
 	readDb.LogMode(true)
144 156
 
157
+	readDb2.DB().SetMaxIdleConns(10)
158
+	readDb2.DB().SetMaxOpenConns(100)
159
+	readDb2.LogMode(true)
160
+
145 161
 	writeDb, err = gorm.Open("mysql", wdsn)
146 162
 	if err != nil {
147 163
 		//beego.Error(err)

+ 1 - 0
routers/router.go View File

@@ -54,6 +54,7 @@ func init() {
54 54
 	controllers.DrugStockManagerApiRegistRouters()
55 55
 	controllers.HisManagerApiRegistRouters()
56 56
 	controllers.HisConfigApiRegistRouters()
57
+	controllers.HisChargeApiRegistRouters()
57 58
 
58 59
 	controllers.HisHospitalManagerApiRegistRouters()
59 60
 

+ 16 - 0
service/db.go View File

@@ -25,6 +25,7 @@ import (
25 25
 )
26 26
 
27 27
 var readDb *gorm.DB
28
+var readDb2 *gorm.DB
28 29
 var writeDb *gorm.DB
29 30
 var readUserDb *gorm.DB
30 31
 var writeUserDb *gorm.DB
@@ -50,6 +51,12 @@ func ConnectDB() {
50 51
 	readPass := beego.AppConfig.String("readmysqlpass")
51 52
 	readName := beego.AppConfig.String("readmysqlname")
52 53
 
54
+	readHost2 := beego.AppConfig.String("readmysqlhost2")
55
+	readPort2 := beego.AppConfig.String("readmysqlport2")
56
+	readUser2 := beego.AppConfig.String("readmysqluser2")
57
+	readPass2 := beego.AppConfig.String("readmysqlpass2")
58
+	readName2 := beego.AppConfig.String("readmysqlname2")
59
+
53 60
 	writeHost := beego.AppConfig.String("writemysqlhost")
54 61
 	writePort := beego.AppConfig.String("writemysqlport")
55 62
 	writeUser := beego.AppConfig.String("writemysqluser")
@@ -117,6 +124,9 @@ func ConnectDB() {
117 124
 	writeUserNameT := beego.AppConfig.String("writeusernameTest")
118 125
 
119 126
 	rdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser, readPass, readHost, readPort, readName)
127
+
128
+	rdsn2 := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser2, readPass2, readHost2, readPort2, readName2)
129
+
120 130
 	wdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUser, writePass, writeHost, writePort, writeName)
121 131
 
122 132
 	rudsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUserUser, readUserPass, readUserHost, readUserPort, readUserName)
@@ -134,6 +144,8 @@ func ConnectDB() {
134 144
 	rudsnT := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUserUserT, readUserPassT, readUserHostT, readUserPortT, readUserNameT)
135 145
 	wudsnT := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUserUserT, writeUserPassT, writeUserHostT, writeUserPortT, writeUserNameT)
136 146
 
147
+	readDb2, err = gorm.Open("mysql", rdsn2)
148
+
137 149
 	readDb, err = gorm.Open("mysql", rdsn)
138 150
 	if err != nil {
139 151
 		//beego.Error(err)
@@ -142,6 +154,10 @@ func ConnectDB() {
142 154
 	readDb.DB().SetMaxOpenConns(100)
143 155
 	readDb.LogMode(true)
144 156
 
157
+	readDb2.DB().SetMaxIdleConns(10)
158
+	readDb2.DB().SetMaxOpenConns(100)
159
+	readDb2.LogMode(true)
160
+
145 161
 	writeDb, err = gorm.Open("mysql", wdsn)
146 162
 	if err != nil {
147 163
 		//beego.Error(err)

+ 216 - 17
service/his_charge_service.go View File

@@ -5,25 +5,224 @@ import (
5 5
 	"github.com/jinzhu/gorm"
6 6
 )
7 7
 
8
-func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64) (patients []*models.ChargePatient, err error) {
9
-	err = readDb.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
10
-		return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
11
-			Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
12
-				return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo", "status = 1").Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
13
-					return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
14
-						return db.Select("id,project_name,unit").Where("status = 1 ")
15
-					}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
16
-						return db.Select("id,good_name,good_unit").Where("status = 1 ")
17
-					}).Where("status = 1 ")
18
-				})
19
-			}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
20
-	}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
8
+func GetAllPatientChargeDetails(org_id int64, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.ChargePatient, err error) {
9
+	if len(keyword) == 0 {
10
+		switch item_type {
11
+		case 0:
12
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
13
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
14
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
15
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").
16
+							Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
17
+								return db.Preload("Drug", "status = 1").Where("status = 1")
18
+							}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
19
+							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
20
+								return db.Select("id,project_name,unit").Where("status = 1 ")
21
+							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
22
+								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
23
+							}).Where("status = 1 ")
24
+						})
25
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
26
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
27
+
28
+			break
29
+		case 1:
30
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
31
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
32
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
33
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
34
+							return db.Preload("Drug", "status = 1").Where("status = 1")
35
+						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
36
+							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
37
+								return db.Select("id,project_name,unit").Where("status = 1 ")
38
+							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
39
+								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
40
+							}).Where("status = 1 ")
41
+						})
42
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
43
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
44
+
45
+			break
46
+		case 2:
47
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
48
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
49
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
50
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
51
+							return db.Preload("Drug", "status = 1").Where("status = 1")
52
+						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
53
+							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
54
+								return db.Select("id,project_name,unit").Where("status = 1 ")
55
+							}).Where("status = 1 ")
56
+						})
57
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
58
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
59
+
60
+			break
61
+		case 3:
62
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
63
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
64
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
65
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
66
+							return db.Preload("Drug", "status = 1").Where("status = 1")
67
+						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
68
+							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
69
+								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
70
+							}).Where("status = 1 ")
71
+						})
72
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
73
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
74
+
75
+			break
76
+
77
+		}
78
+
79
+	} else {
80
+		keyword := "%" + keyword + "%"
81
+		switch item_type {
82
+		case 0:
83
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
84
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
85
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
86
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
87
+							return db.Preload("Drug", "status = 1").Where("status = 1")
88
+						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
89
+							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
90
+								return db.Select("id,project_name,unit").Where("status = 1 ")
91
+							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
92
+								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
93
+							}).Where("status = 1 ")
94
+						})
95
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
96
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
97
+
98
+			break
99
+		case 1:
100
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
101
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
102
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
103
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id > 0 AND project_id = 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
104
+							return db.Preload("Drug", "status = 1").Where("status = 1")
105
+						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
106
+							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
107
+								return db.Select("id,project_name,unit").Where("status = 1 ")
108
+							}).Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
109
+								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
110
+							}).Where("status = 1 ")
111
+						})
112
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
113
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
114
+
115
+			break
116
+		case 2:
117
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
118
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
119
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
120
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
121
+							return db.Preload("Drug", "status = 1").Where("status = 1")
122
+						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
123
+							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeProject", func(db *gorm.DB) *gorm.DB {
124
+								return db.Select("id,project_name,unit").Where("status = 1 ")
125
+							}).Where("status = 1 ")
126
+						})
127
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
128
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
129
+
130
+			break
131
+		case 3:
132
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeOrder", func(db *gorm.DB) *gorm.DB {
133
+				return db.Select("id,user_org_id,his_patient_id,settle_accounts_date,status,number,order_status,mdtrt_id,patient_id").
134
+					Preload("HisChargeOrderInfo", func(db *gorm.DB) *gorm.DB {
135
+						return db.Select("id,order_number,advice_id,det_item_fee_sumamt,cnt,pric,med_chrgitm_type,status,chld_medc_flag,chrgitm_lv,user_org_id,project_id,type").Where("advice_id = 0 AND project_id > 0").Preload("HisChargeDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
136
+							return db.Preload("Drug", "status = 1").Where("status = 1")
137
+						}).Preload("HisChargePrescriptionProject", func(db *gorm.DB) *gorm.DB {
138
+							return db.Select("id,project_id,user_org_id,status,patient_id,record_date,count,type").Preload("HisChargeGoodInfo", func(db *gorm.DB) *gorm.DB {
139
+								return db.Select("id,good_name,good_unit,specification_name").Where("status = 1 ")
140
+							}).Where("status = 1 ")
141
+						})
142
+					}).Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
143
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
144
+
145
+			break
146
+
147
+		}
148
+
149
+	}
150
+
21 151
 	return
22 152
 }
23 153
 
24
-func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64) (patients []*models.SettlePatient, err error) {
25
-	err = readDb.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
26
-		return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
27
-	}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
154
+func GetAllPatientChargeSettle(org_id int64, start_time int64, end_time int64, keyword string, item_type int64) (patients []*models.SettlePatient, err error) {
155
+	if len(keyword) == 0 {
156
+		switch item_type {
157
+		case 0:
158
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
159
+				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
160
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
161
+
162
+			break
163
+		case 1:
164
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
165
+				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 1 ", start_time, end_time, org_id)
166
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
167
+
168
+			break
169
+		case 2:
170
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
171
+				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 0", start_time, end_time, org_id)
172
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
173
+
174
+			break
175
+		case 3:
176
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
177
+				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 14", start_time, end_time, org_id)
178
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
179
+
180
+			break
181
+		case 4:
182
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
183
+				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id)
184
+			}).Where("p.status = 1  AND p.user_org_id = ?", org_id).Group("id").Find(&patients).Error
185
+
186
+			break
187
+
188
+		}
189
+
190
+	} else {
191
+		keyword = "%" + keyword + "%"
192
+		switch item_type {
193
+		case 0:
194
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
195
+				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2", start_time, end_time, org_id)
196
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
197
+
198
+			break
199
+		case 1:
200
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
201
+				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 1 ", start_time, end_time, org_id)
202
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
203
+
204
+			break
205
+		case 2:
206
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
207
+				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND is_medicine_insurance = 0", start_time, end_time, org_id)
208
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
209
+
210
+			break
211
+		case 3:
212
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
213
+				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 14", start_time, end_time, org_id)
214
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
215
+
216
+			break
217
+		case 4:
218
+			err = readDb2.Table("xt_patients as p").Select("p.id,p.user_org_id,p.name,p.lapseto,p.status").Joins("JOIN his_order AS orders ON orders.patient_id = p.id AND orders.status = 1  AND orders.settle_accounts_date >= ? AND orders.settle_accounts_date <= ? AND orders.user_org_id = ? AND orders.order_status = 2", start_time, end_time, org_id).Preload("HisChargeSettleOrder", func(db *gorm.DB) *gorm.DB {
219
+				return db.Where("status = 1  AND settle_accounts_date >= ? AND settle_accounts_date <= ? AND user_org_id = ? AND order_status = 2 AND med_type = 11", start_time, end_time, org_id)
220
+			}).Where("p.status = 1  AND p.user_org_id = ? AND p.name LIKE ?", org_id, keyword).Group("id").Find(&patients).Error
221
+
222
+			break
223
+
224
+		}
225
+	}
226
+
28 227
 	return
29 228
 }

+ 5 - 10
service/his_hospital_service.go View File

@@ -103,20 +103,15 @@ func GetHisHospitalSchPatientList(org_id int64, record_date int64, sch_type int6
103 103
 
104 104
 }
105 105
 
106
-func GetNewAllUnChargeHisHospitalPatientList(org_id int64, record_date int64) (patients []*HospitalPatient, err error) {
107
-	db := readDb.Model(&HospitalPatient{}).Where("xt_patients.user_org_id = ? AND xt_patients.status = 1", org_id)
108
-	db = db.Joins("join his_hospital_check_record as hp ON hp.patient_id = xt_patients.id  AND hp.status = 1 AND hp.user_org_id = ? ", org_id)
109
-
110
-	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
111
-		return db.Where("status = 1 AND user_org_id = ? AND in_hospital_status = 1", org_id).Preload("HisHospitalOrder", "user_org_id = ? AND status = 1", org_id)
112
-	})
113
-	//db = db.Preload("HisHospitalOrder", "user_org_id = ? AND status = 1 ", org_id)
114
-	err = db.Group("id").Find(&patients).Error
106
+func GetNewAllUnChargeHisHospitalPatientList(org_id int64, record_date int64) (patients []*models.HisHospitalCheckRecord, err error) {
107
+	db := readDb.Model(&models.HisHospitalCheckRecord{}).Where("his_hospital_check_record.user_org_id = ? AND his_hospital_check_record.status = 1 AND his_hospital_check_record.in_hospital_status = 1", org_id)
108
+	db = db.Preload("HisHospitalOrder", "user_org_id = ? AND status = 1", org_id)
109
+	err = db.Group("number").Find(&patients).Error
115 110
 	return
116 111
 }
117 112
 
118 113
 func GetNewAllChargeHisHospitalPatientList(org_id int64, record_date int64) (orders []*HisHospitalOrder, err error) {
119
-	db := readDb.Model(&HisHospitalOrder{}).Where("his_order.user_org_id = ? AND his_order.status = 1 AND his_order.settle_accounts_date = ? AND his_order.p_type = 1", org_id, record_date)
114
+	db := readDb.Model(&HisHospitalOrder{}).Where("his_order.user_org_id = ? AND his_order.status = 1 AND his_order.settle_accounts_date = ? AND his_order.p_type = 1 AND his_order.order_status = 2", org_id, record_date)
120 115
 	db = db.Preload("Patient", "status = 1")
121 116
 	db = db.Preload("HisHospitalCheckRecord", func(db *gorm.DB) *gorm.DB {
122 117
 		return db.Where("status = 1 AND user_org_id = ? AND in_hospital_status = 1", org_id)

+ 1 - 1
service/his_service.go View File

@@ -1513,7 +1513,7 @@ type HisPrescriptionProject struct {
1513 1513
 	HisPatientId       int64        `gorm:"column:his_patient_id" json:"his_patient_id" form:"his_patient_id"`
1514 1514
 	RecordDate         int64        `gorm:"column:record_date" json:"record_date" form:"record_date"`
1515 1515
 	PrescriptionId     int64        `gorm:"column:prescription_id" json:"prescription_id" form:"prescription_id"`
1516
-	Count              float64      `gorm:"column:count" json:"count" form:"count"`
1516
+	Count              int64        `gorm:"column:count" json:"count" form:"count"`
1517 1517
 	FeedetlSn          string       `gorm:"column:feedetl_sn" json:"feedetl_sn" form:"feedetl_sn"`
1518 1518
 	MedListCodg        string       `gorm:"column:med_list_codg" json:"med_list_codg" form:"med_list_codg"`
1519 1519
 	SingleDose         string       `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`