浏览代码

医保对接

csx 3 年前
父节点
当前提交
5262b4bfb8
共有 2 个文件被更改,包括 13 次插入2 次删除
  1. 2 1
      controllers/his_api_controller.go
  2. 11 1
      service/his_service.go

+ 2 - 1
controllers/his_api_controller.go 查看文件

@@ -3935,6 +3935,7 @@ func (c *HisApiController) GetHisOrderList() {
3935 3935
 	keywords := c.GetString("keywords")
3936 3936
 	p_type, _ := c.GetInt64("p_type", 0)
3937 3937
 	sort_type, _ := c.GetInt64("sort_type", 0)
3938
+	charge_type, _ := c.GetInt64("charge_type", 0)
3938 3939
 
3939 3940
 	timeLayout := "2006-01-02"
3940 3941
 	loc, _ := time.LoadLocation("Local")
@@ -3961,7 +3962,7 @@ func (c *HisApiController) GetHisOrderList() {
3961 3962
 
3962 3963
 	adminUser := c.GetAdminUserInfo()
3963 3964
 	org_id := adminUser.CurrentOrgId
3964
-	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time)
3965
+	order, err, total := service.GetHisOrderList(org_id, page, limit, startTime, endTime, types, keywords, p_type, sort_type, start_time, end_time, charge_type)
3965 3966
 
3966 3967
 	for _, item := range order {
3967 3968
 		info, _ := service.GetHisPrescriptionByPatientID(item.PatientId, item.UserOrgId)

+ 11 - 1
service/his_service.go 查看文件

@@ -888,7 +888,7 @@ func SavePatientPrescriptionInfo(info models.HisPrescriptionInfo) (err error) {
888 888
 	return
889 889
 }
890 890
 
891
-func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string) (order []*models.HisOrder, err error, total int64) {
891
+func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_timestamp int64, end_time_timestamp int64, doctor_id int64, keywords string, p_type int64, sort_type int64, start_time string, end_time string, charge_type int64) (order []*models.HisOrder, err error, total int64) {
892 892
 	offset := (page - 1) * limit
893 893
 	db := readDb.Model(&models.HisOrder{})
894 894
 
@@ -925,6 +925,16 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
925 925
 		db = db.Where("his_order.status = 1 AND his_order.user_org_id = ? AND his_order.order_status = 2", user_org_id)
926 926
 
927 927
 	}
928
+
929
+	if charge_type > 0 {
930
+		if charge_type == 2 {
931
+			db = db.Where("his_order.is_medicine_insurance = 0")
932
+		} else {
933
+
934
+			db = db.Where("his_order.is_medicine_insurance = ?", charge_type)
935
+
936
+		}
937
+	}
928 938
 	db = db.Preload("HisOrderInfo", "status = 1 AND user_org_id = ?", user_org_id).
929 939
 		Preload("Patients", "status = 1 AND user_org_id = ?", user_org_id).
930 940
 		Preload("HisPatient", "status = 1 AND user_org_id = ?", user_org_id).