Browse Source

医保对接

csx 3 years ago
parent
commit
1eae43f82d

+ 52 - 50
controllers/base_api_controller.go View File

2
 
2
 
3
 import (
3
 import (
4
 	"XT_New/enums"
4
 	"XT_New/enums"
5
+	"XT_New/models"
6
+
5
 	//"XT_New/models"
7
 	//"XT_New/models"
6
 
8
 
7
 	//"XT_New/models"
9
 	//"XT_New/models"
67
 func (this *BaseAuthAPIController) Prepare() {
69
 func (this *BaseAuthAPIController) Prepare() {
68
 	this.BaseAPIController.Prepare()
70
 	this.BaseAPIController.Prepare()
69
 	if this.GetAdminUserInfo() == nil {
71
 	if this.GetAdminUserInfo() == nil {
70
-		//var userAdmin models.AdminUser
71
-		//userAdmin.Id = 1448
72
-		//userAdmin.Mobile = "13318599895"
72
+		var userAdmin models.AdminUser
73
+		userAdmin.Id = 1448
74
+		userAdmin.Mobile = "13318599895"
73
 
75
 
74
 		//userAdmin.Id = 597
76
 		//userAdmin.Id = 597
75
 		//userAdmin.Mobile = "19874122664"
77
 		//userAdmin.Mobile = "19874122664"
76
-		//userAdmin.IsSuperAdmin = false
77
-		//userAdmin.Status = 1
78
-		//userAdmin.CreateTime = 1530786071
79
-		//userAdmin.ModifyTime = 1530786071
80
-		//var subscibe models.ServeSubscibe
81
-		//subscibe.ID = 1
82
-		//subscibe.OrgId = 4
83
-		//subscibe.PeriodStart = 1538035409
84
-		//subscibe.PeriodEnd = 1569571409
85
-		//subscibe.State = 1
86
-		//subscibe.Status = 1
87
-		//subscibe.CreatedTime = 1538035409
88
-		//subscibe.UpdatedTime = 1538035409
89
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
90
-		//subscibes[4] = &subscibe
91
-		//var adminUserInfo service.AdminUserInfo
92
-		//adminUserInfo.CurrentOrgId = 4
93
-		//adminUserInfo.CurrentAppId = 4
94
-		//adminUserInfo.AdminUser = &userAdmin
95
-		//adminUserInfo.Subscibes = subscibes
96
-		//this.SetSession("admin_user_info", &adminUserInfo)
78
+		userAdmin.IsSuperAdmin = false
79
+		userAdmin.Status = 1
80
+		userAdmin.CreateTime = 1530786071
81
+		userAdmin.ModifyTime = 1530786071
82
+		var subscibe models.ServeSubscibe
83
+		subscibe.ID = 1
84
+		subscibe.OrgId = 4
85
+		subscibe.PeriodStart = 1538035409
86
+		subscibe.PeriodEnd = 1569571409
87
+		subscibe.State = 1
88
+		subscibe.Status = 1
89
+		subscibe.CreatedTime = 1538035409
90
+		subscibe.UpdatedTime = 1538035409
91
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
92
+		subscibes[4] = &subscibe
93
+		var adminUserInfo service.AdminUserInfo
94
+		adminUserInfo.CurrentOrgId = 4
95
+		adminUserInfo.CurrentAppId = 4
96
+		adminUserInfo.AdminUser = &userAdmin
97
+		adminUserInfo.Subscibes = subscibes
98
+		this.SetSession("admin_user_info", &adminUserInfo)
97
 
99
 
98
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
100
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
99
 		this.StopRun()
101
 		this.StopRun()
313
 func (this *BaseServeAPIController) Prepare() {
315
 func (this *BaseServeAPIController) Prepare() {
314
 	this.BaseAPIController.Prepare()
316
 	this.BaseAPIController.Prepare()
315
 	if this.GetAdminUserInfo() == nil {
317
 	if this.GetAdminUserInfo() == nil {
316
-		//var userAdmin models.AdminUser
317
-		//userAdmin.Id = 1448
318
-		//userAdmin.Mobile = "13318599895"
318
+		var userAdmin models.AdminUser
319
+		userAdmin.Id = 1448
320
+		userAdmin.Mobile = "13318599895"
319
 
321
 
320
 		//userAdmin.Id = 597
322
 		//userAdmin.Id = 597
321
 		//userAdmin.Mobile = "19874122664"
323
 		//userAdmin.Mobile = "19874122664"
322
-		//userAdmin.IsSuperAdmin = false
323
-		//userAdmin.Status = 1
324
-		//userAdmin.CreateTime = 1530786071
325
-		//userAdmin.ModifyTime = 1530786071
326
-		//var subscibe models.ServeSubscibe
327
-		//subscibe.ID = 1
328
-		//subscibe.OrgId = 4
329
-		//subscibe.PeriodStart = 1538035409
330
-		//subscibe.PeriodEnd = 1569571409
331
-		//subscibe.State = 1
332
-		//subscibe.Status = 1
333
-		//subscibe.CreatedTime = 1538035409
334
-		//subscibe.UpdatedTime = 1538035409
335
-		//subscibes := make(map[int64]*models.ServeSubscibe, 0)
336
-		//subscibes[4] = &subscibe
337
-		//var adminUserInfo service.AdminUserInfo
338
-		//adminUserInfo.CurrentOrgId = 4
339
-		//adminUserInfo.CurrentAppId = 4
340
-		//adminUserInfo.AdminUser = &userAdmin
341
-		//adminUserInfo.Subscibes = subscibes
342
-		//this.SetSession("admin_user_info", &adminUserInfo)
343
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
344
-		this.StopRun()
324
+		userAdmin.IsSuperAdmin = false
325
+		userAdmin.Status = 1
326
+		userAdmin.CreateTime = 1530786071
327
+		userAdmin.ModifyTime = 1530786071
328
+		var subscibe models.ServeSubscibe
329
+		subscibe.ID = 1
330
+		subscibe.OrgId = 10106
331
+		subscibe.PeriodStart = 1538035409
332
+		subscibe.PeriodEnd = 1569571409
333
+		subscibe.State = 1
334
+		subscibe.Status = 1
335
+		subscibe.CreatedTime = 1538035409
336
+		subscibe.UpdatedTime = 1538035409
337
+		subscibes := make(map[int64]*models.ServeSubscibe, 0)
338
+		subscibes[4] = &subscibe
339
+		var adminUserInfo service.AdminUserInfo
340
+		adminUserInfo.CurrentOrgId = 4
341
+		adminUserInfo.CurrentAppId = 4
342
+		adminUserInfo.AdminUser = &userAdmin
343
+		adminUserInfo.Subscibes = subscibes
344
+		this.SetSession("admin_user_info", &adminUserInfo)
345
+		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
346
+		//this.StopRun()
345
 	}
347
 	}
346
 
348
 
347
 	//if adminUserInfo.AppRole != nil {
349
 	//if adminUserInfo.AppRole != nil {

+ 9 - 2
controllers/manager_center_api_controller.go View File

134
 	loc, _ := time.LoadLocation("Local")
134
 	loc, _ := time.LoadLocation("Local")
135
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
135
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
136
 	drug_remark := c.GetString("drug_remark")
136
 	drug_remark := c.GetString("drug_remark")
137
+	//hosp_appr_flag
138
+	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
139
+	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
137
 	adminInfo := c.GetAdminUserInfo()
140
 	adminInfo := c.GetAdminUserInfo()
138
-
139
 	drugLib := &models.BaseDrugLib{
141
 	drugLib := &models.BaseDrugLib{
140
 		DrugName:                    drug_name,
142
 		DrugName:                    drug_name,
141
 		Pinyin:                      pinyin,
143
 		Pinyin:                      pinyin,
190
 		SocialSecurityDirectoryCode: social_security_directory_code,
192
 		SocialSecurityDirectoryCode: social_security_directory_code,
191
 		RecordDate:                  theTime.Unix(),
193
 		RecordDate:                  theTime.Unix(),
192
 		DrugRemark:                  drug_remark,
194
 		DrugRemark:                  drug_remark,
195
+		HospApprFlag:                hosp_appr_flag,
196
+		LmtUsedFlag:                 lmt_used_flag,
193
 	}
197
 	}
194
 
198
 
195
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
199
 	total := service.FindAllDrugLibRecordTotal(adminInfo.CurrentOrgId)
274
 	loc, _ := time.LoadLocation("Local")
278
 	loc, _ := time.LoadLocation("Local")
275
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
279
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
276
 	drug_remark := c.GetString("drug_remark")
280
 	drug_remark := c.GetString("drug_remark")
281
+	hosp_appr_flag, _ := c.GetInt64("hosp_appr_flag")
282
+	lmt_used_flag, _ := c.GetInt64("lmt_used_flag")
277
 	adminInfo := c.GetAdminUserInfo()
283
 	adminInfo := c.GetAdminUserInfo()
278
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
284
 	drug, _ := service.FindBaseDrugLibRecord(adminInfo.CurrentOrgId, id)
279
-
280
 	drugLib := &models.BaseDrugLib{
285
 	drugLib := &models.BaseDrugLib{
281
 		ID:                          id,
286
 		ID:                          id,
282
 		DrugName:                    drug_name,
287
 		DrugName:                    drug_name,
333
 		SocialSecurityDirectoryCode: social_security_directory_code,
338
 		SocialSecurityDirectoryCode: social_security_directory_code,
334
 		RecordDate:                  theTime.Unix(),
339
 		RecordDate:                  theTime.Unix(),
335
 		DrugRemark:                  drug_remark,
340
 		DrugRemark:                  drug_remark,
341
+		HospApprFlag:                hosp_appr_flag,
342
+		LmtUsedFlag:                 lmt_used_flag,
336
 	}
343
 	}
337
 
344
 
338
 	err := service.UpdateBaseDrugLib(drugLib)
345
 	err := service.UpdateBaseDrugLib(drugLib)

+ 2 - 0
models/drug.go View File

57
 	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
57
 	DrugRemark                  string  `gorm:"column:drug_remark" json:"drug_remark" form:"drug_remark"`
58
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
58
 	SocialSecurityDirectoryCode string  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
59
 	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
59
 	IsMark                      int64   `gorm:"column:is_mark" json:"is_mark" form:"is_mark"`
60
+	HospApprFlag                int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
61
+	LmtUsedFlag                 int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
60
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
62
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
61
 }
63
 }
62
 
64
 

+ 6 - 0
models/his_models.go View File

233
 	ChildDoctorAdvice     []*HisDoctorAdviceInfo `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
233
 	ChildDoctorAdvice     []*HisDoctorAdviceInfo `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
234
 	Drug                  Drug                   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
234
 	Drug                  Drug                   `gorm:"ForeignKey:ID;AssociationForeignKey:DrugId" json:"drug"`
235
 	Diagnosis             int64                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
235
 	Diagnosis             int64                  `gorm:"column:diagnosis" json:"diagnosis" form:"diagnosis"`
236
+	HospApprFlag          int64                  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
237
+	LmtUsedFlag           int64                  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
236
 }
238
 }
237
 
239
 
238
 func (HisDoctorAdviceInfo) TableName() string {
240
 func (HisDoctorAdviceInfo) TableName() string {
254
 	OrgId                  int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
256
 	OrgId                  int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
255
 	DrugCode               string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
257
 	DrugCode               string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
256
 	MedicalInsuranceNumber string `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
258
 	MedicalInsuranceNumber string `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
259
+	HospApprFlag           int64  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
260
+	LmtUsedFlag            int64  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
257
 }
261
 }
258
 
262
 
259
 func (Drug) TableName() string {
263
 func (Drug) TableName() string {
472
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
476
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
473
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
477
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
474
 	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number"`
478
 	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number"`
479
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
480
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
475
 }
481
 }
476
 
482
 
477
 func (VMDrug) TableName() string {
483
 func (VMDrug) TableName() string {

+ 2 - 0
models/self_drug_models.go View File

63
 	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
63
 	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
64
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
64
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
65
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
65
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
66
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
67
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
66
 }
68
 }
67
 
69
 
68
 func (XtBaseDrug) TableName() string {
70
 func (XtBaseDrug) TableName() string {

+ 2 - 0
models/service/stock_service.go View File

520
 	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
520
 	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
521
 	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
521
 	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
522
 	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
522
 	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
523
+	HospApprFlag    int64  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
524
+	LmtUsedFlag     int64  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
523
 }
525
 }
524
 
526
 
525
 func (Drug) TableName() string {
527
 func (Drug) TableName() string {

+ 15 - 11
service/drug_stock_service.go View File

19
 	RetailPrice  float64      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
19
 	RetailPrice  float64      `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
20
 	LastPrice    float64      `gorm:"column:last_price" json:"last_price" form:"last_price"`
20
 	LastPrice    float64      `gorm:"column:last_price" json:"last_price" form:"last_price"`
21
 	MinUnit      string       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
21
 	MinUnit      string       `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
22
+	HospApprFlag int64        `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
23
+	LmtUsedFlag  int64        `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
22
 }
24
 }
23
 
25
 
24
 func (DrugConfig) TableName() string {
26
 func (DrugConfig) TableName() string {
69
 }
71
 }
70
 
72
 
71
 type DrugStockInfo struct {
73
 type DrugStockInfo struct {
72
-	ID          int64   `gorm:"column:id" json:"id" form:"id"`
73
-	DrugName    string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
74
-	DrugSpec    string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
75
-	RetailPrice float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
76
-	LastPrice   float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
77
-	DrugStatus  string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
78
-	Status      int64   `gorm:"column:status" json:"status" form:"status"`
79
-	Ctime       int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
80
-	Mtime       int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
81
-	OrgId       int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
82
-	DrugCode    string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
74
+	ID           int64   `gorm:"column:id" json:"id" form:"id"`
75
+	DrugName     string  `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
76
+	DrugSpec     string  `gorm:"column:drug_spec" json:"drug_spec" form:"drug_spec"`
77
+	RetailPrice  float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
78
+	LastPrice    float64 `gorm:"column:last_price" json:"last_price" form:"last_price"`
79
+	DrugStatus   string  `gorm:"column:drug_status" json:"drug_status" form:"drug_status"`
80
+	Status       int64   `gorm:"column:status" json:"status" form:"status"`
81
+	Ctime        int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
82
+	Mtime        int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
83
+	OrgId        int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
84
+	DrugCode     string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
85
+	HospApprFlag int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
86
+	LmtUsedFlag  int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
83
 
87
 
84
 	QueryWarehousingInfo  []models.DrugWarehouseInfo    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehousing_info"`
88
 	QueryWarehousingInfo  []models.DrugWarehouseInfo    `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_warehousing_info"`
85
 	QuerySalesReturnInfo  []models.DrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_sales_return_info"`
89
 	QuerySalesReturnInfo  []models.DrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"query_drug_sales_return_info"`

+ 12 - 5
service/his_service.go View File

2
 
2
 
3
 import (
3
 import (
4
 	"XT_New/models"
4
 	"XT_New/models"
5
+	"fmt"
5
 	"github.com/jinzhu/gorm"
6
 	"github.com/jinzhu/gorm"
6
 	"strings"
7
 	"strings"
7
 	"time"
8
 	"time"
536
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
537
 	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
537
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
538
 	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
538
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
539
 	DrugCode               string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
540
+	HospApprFlag           int64   `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
541
+	LmtUsedFlag            int64   `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
539
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
542
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
540
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
543
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
541
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`
544
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`
1347
 	db = db.Preload("GdybPsnNcdsRecord", func(db *gorm.DB) *gorm.DB {
1350
 	db = db.Preload("GdybPsnNcdsRecord", func(db *gorm.DB) *gorm.DB {
1348
 		return db.Model(&GdybPsnNcdsRecord{}).Where("user_org_id = ?", orgID).Order("id asc")
1351
 		return db.Model(&GdybPsnNcdsRecord{}).Where("user_org_id = ?", orgID).Order("id asc")
1349
 	})
1352
 	})
1353
+	fmt.Println(is_cancel)
1350
 	if len(keywords) == 0 {
1354
 	if len(keywords) == 0 {
1351
-		if is_cancel != 0 {
1355
+		if is_cancel == 1 {
1352
 			db = db.Joins("JOIN gdyb_psn_ncds_record On gdyb_psn_ncds_record.patient_id = xt_patients.id AND gdyb_psn_ncds_record.is_cancel = ?", is_cancel)
1356
 			db = db.Joins("JOIN gdyb_psn_ncds_record On gdyb_psn_ncds_record.patient_id = xt_patients.id AND gdyb_psn_ncds_record.is_cancel = ?", is_cancel)
1353
-			db = db.Where("user_org_id = ? AND status = 1 AND lapseto = 1", orgID)
1354
-		} else {
1357
+			db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 AND xt_patients.lapseto = 1", orgID)
1358
+		} else if is_cancel == 0 {
1355
 			db = db.Preload("GdybPsnNcdsRecord", "user_org_id = ?", orgID)
1359
 			db = db.Preload("GdybPsnNcdsRecord", "user_org_id = ?", orgID)
1356
-			db = db.Where("user_org_id = ? AND status = 1 AND lapseto = 1", orgID)
1360
+			db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 AND xt_patients.lapseto = 1", orgID)
1361
+		} else if is_cancel == 2 {
1362
+			db = db.Joins("LEFT JOIN gdyb_psn_ncds_record On gdyb_psn_ncds_record.patient_id = xt_patients.id AND (gdyb_psn_ncds_record.is_cancel <> 1 OR gdyb_psn_ncds_record.is_cancel is null)")
1363
+			db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 AND xt_patients.lapseto = 1", orgID)
1357
 		}
1364
 		}
1358
 		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
1365
 		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
1359
 	} else {
1366
 	} else {
1360
 		keywords = "%" + keywords + "%"
1367
 		keywords = "%" + keywords + "%"
1361
-		db = db.Where("user_org_id = ? AND status = 1 AND lapseto = 1 AND name LIKE ?", orgID, keywords)
1368
+		db = db.Where("xt_patients.user_org_id = ? AND xt_patients.status = 1 AND xt_patients.lapseto = 1 AND xt_patients.name LIKE ?", orgID, keywords)
1362
 		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
1369
 		err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
1363
 
1370
 
1364
 	}
1371
 	}

+ 2 - 0
service/self_drug_service.go View File

532
 	OrgId              int64    `gorm:"column:org_id" json:"org_id" form:"org_id"`
532
 	OrgId              int64    `gorm:"column:org_id" json:"org_id" form:"org_id"`
533
 	MinUnit            string   `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
533
 	MinUnit            string   `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
534
 	Drugs              []*Drugs `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
534
 	Drugs              []*Drugs `gorm:"ForeignKey:DrugName;AssociationForeignKey:DrugName" json:"drug_specs"`
535
+	HospApprFlag       int64    `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
536
+	LmtUsedFlag        int64    `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
535
 }
537
 }
536
 
538
 
537
 func (Drugs) TableName() string {
539
 func (Drugs) TableName() string {

+ 2 - 0
service/stock_service.go View File

553
 	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
553
 	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
554
 	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
554
 	OrgId           int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
555
 	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
555
 	DrugCode        string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
556
+	HospApprFlag    int64  `gorm:"column:hosp_appr_flag" json:"hosp_appr_flag" form:"hosp_appr_flag"`
557
+	LmtUsedFlag     int64  `gorm:"column:lmt_used_flag" json:"lmt_used_flag" form:"lmt_used_flag"`
556
 }
558
 }
557
 
559
 
558
 func (Drug) TableName() string {
560
 func (Drug) TableName() string {