Merge branch 'master' of http://git.shengws.com/csx/gdyb

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
 httpport = 9532
-runmode = dev
+runmode = prod
 
 #
 copyrequestbody = true
@@ -44,7 +44,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 9919
+org_id = 9990
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,9 +53,9 @@ front_end_domain = "https://xt.kuyicloud.com/#"
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
 url = "http://192.168.1.88:6666/szsi-portal/transData"
 gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
-gdyb_paasid = "sg03_prd"
+#gdyb_paasid = "sg03_prd"
 #gdyb_paasid = "jm_sc_yjyy"
-#gdyb_paasid = "zh_prd_yjyy"
+gdyb_paasid = "zh_prd_yjyy"
 
 readmysqlhost = shengws1.mysql.rds.aliyuncs.com
 readmysqlport = 3306

controllers/zh/zh_his_api_controller.go

@@ -246,7 +246,6 @@ func ZHHisManagerApiRegistRouters() {
 	beego.Router("/zh/api/outhopitalcheck/get", &ZHHisApiController{}, "get:GetZHOutHospitalCheck")
 	beego.Router("/zh/api/uploadinfo/get", &ZHHisApiController{}, "get:GetUploadInfo")
 	beego.Router("/zh/api/settle/get", &ZHHisApiController{}, "get:GetSettleInfo")
-
 	beego.Router("/zh/api/inthopitaluncheck/get", &ZHHisApiController{}, "get:GetZHInHospitalUnCheck")
 	beego.Router("/zh/api/outhopitaluncheck/get", &ZHHisApiController{}, "get:GetZHOutHospitalUnCheck")
 	beego.Router("/zh/api/refund", &ZHHisApiController{}, "get:ZHRefund")
@@ -818,7 +817,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 
 	data := make(map[string]interface{})
 	if settle_accounts_type == 1 { //日结
-		prescriptions, _ = service.GetHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
+		prescriptions, _ = service.GetZHHisPrescription(adminUser.CurrentOrgId, id, recordDateTime)
 		data["pre"] = prescriptions
 
 	} else { //月结
@@ -840,7 +839,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 		}
 		recordEndTime := theEndTime.Unix()
 		end_time = recordEndTime
-		prescriptions, _ = service.GetMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
+		prescriptions, _ = service.GetZHMonthHisPrescription(adminUser.CurrentOrgId, id, recordStartTime, recordEndTime)
 		data["pre"] = prescriptions
 
 	}

service/his_service.go

@@ -291,7 +291,7 @@ func GetHisPrescription(org_id int64, patient_id int64, record_date int64) (pres
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2", org_id, record_date, patient_id).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND p_type <> 1", org_id, record_date, patient_id).
 		Find(&prescription).Error
 	return
 }
@@ -997,7 +997,7 @@ func GetMonthHisPrescription(org_id int64, patient_id int64, start_time int64, e
 		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
 			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
 		}).
-		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND status = 1 ", org_id, start_time, end_time, patient_id).
+		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND status = 1  AND p_type <> 1", org_id, start_time, end_time, patient_id).
 		Find(&prescription).Error
 	return
 }

service/zh_his_service.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"gdyb/models"
 	"github.com/astaxie/beego"
+	"github.com/jinzhu/gorm"
 	"io/ioutil"
 	"net/http"
 	"strconv"
@@ -927,3 +928,35 @@ func GetLastHospitalRecord(id int64, user_org_id int64) (record models.HisHospit
 	err = readDb.Model(&models.HisHospitalCheckRecord{}).Where("id = ? AND status = 1 AND user_org_id = ?", id, user_org_id).Last(&record).Error
 	return
 }
+
+func GetZHHisPrescription(org_id int64, patient_id int64, record_date int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+		}).
+		Where("user_org_id = ? AND status = 1 AND record_date = ? AND patient_id = ? AND order_status <> 2 AND p_type = 1", org_id, record_date, patient_id).
+		Find(&prescription).Error
+	return
+}
+
+func GetZHMonthHisPrescription(org_id int64, patient_id int64, start_time int64, end_time int64) (prescription []*models.HisPrescription, err error) {
+	err = readDb.Model(&models.HisPrescription{}).
+		Preload("HisAdditionalCharge", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("XtHisAddtionConfig", "status=1")
+		}).
+		Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("BaseDrugLib", "status=1")
+		}).
+		Preload("HisPrescriptionProject", func(db *gorm.DB) *gorm.DB {
+			return db.Where("status = 1 AND user_org_id = ?", org_id).Preload("HisProject", "status=1")
+		}).
+		Where("user_org_id = ? AND record_date >= ? AND record_date <= ? AND patient_id = ? AND order_status <> 2 AND status = 1 AND p_type = 1 ", org_id, start_time, end_time, patient_id).
+		Find(&prescription).Error
+	return
+}