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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10265
+org_id = 10215
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com
@@ -53,15 +53,15 @@ call_domain = https://hf.sgjyun.com
 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_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
 #gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
 # gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
 #内蒙古
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
-gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
+# gdyb_url = "http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service"
 # gdyb_url = "http://19.15.78.136:20001/ebus/gdyb_inf/poc/hsa/hgs/gzzq/"
 #韶关
-# gdyb_paasid = "sg03_prd"
+gdyb_paasid = "sg03_prd"
 #江门
 #gdyb_paasid = "jm_sc_yjyy"
 #珠海

controllers/zh/zh_his_api_controller.go

@@ -1089,7 +1089,7 @@ func (c *ZHHisApiController) GetZHInHospitalCheck() {
 			dise.DiagCode = item.CountryCode
 			dise.DiagName = item.ClassName
 			dise.DiagDept = departmentInfo.Name
-			dise.DiseDorNo = strconv.FormatInt(int64(doctorInfo.AdminUserId), 10)
+			dise.DiseDorNo = doctorInfo.DoctorNumber
 			dise.DiagTime = timeFormatOne
 
 			dises = append(dises, dise)
@@ -2225,7 +2225,7 @@ func (c *ZHHisApiController) GetUploadInfo() {
 				result_byte, _ := json.Marshal(respJSON)
 				result = string(result_byte)
 			} else {
-				result, requestLog = service.ZHGdyb2301(record.PsnNo, record.Number, customs[start-1:stop], chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(department.ID, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["med_type"].(string))
+				result, requestLog = service.ZHGdyb2301(record.PsnNo, record.Number, customs[start-1:stop], chrg_bchno, miConfig.OrgName, roles.UserName, strconv.FormatInt(department.ID, 10), miConfig.Code, department.Number, strconv.FormatInt(roles.AdminUserId, 10), record.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, data["med_type"].(string), doctor_info.DoctorNumber, doctor_info.UserName)
 				saveLog(result, requestLog, "2301", "上传明细")
 			}
 

main.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"gdyb/models"
 	_ "gdyb/routers"
+	"gdyb/service"
+
 	//"gdyb/service"
 	"github.com/astaxie/beego"
 	"github.com/qiniu/api.v7/auth/qbox"
@@ -15,11 +17,11 @@ import (
 )
 
 func init() {
-	//service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//CreateLog(miConfig)
-	//UploadLog(miConfig)
+	service.ConnectDB()
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	CreateLog(miConfig)
+	UploadLog(miConfig)
 	//UploadSettleList(org_id)
 }
 func main() {

routers/router.go

@@ -3,6 +3,7 @@ package routers
 import (
 	"gdyb/controllers/nm"
 	"gdyb/controllers/sg"
+	"gdyb/controllers/zh"
 
 	//"gdyb/controllers/sz"
 	//"gdyb/controllers/sz"
@@ -25,7 +26,7 @@ func init() {
 	//sg.GdybRegistRouters()
 	//hb.HbybRegistRouters()
 	//sz.SZHisManagerApiRegistRouters()
-	//zh.ZHHisManagerApiRegistRouters()
+	zh.ZHHisManagerApiRegistRouters()
 	//js.JSybRegistRouters()
 	nm.NmybRegistRouters()
 	//coordinate.CoordinateRegistRouters()

service/zh_his_service.go

@@ -554,7 +554,7 @@ type ZHResult struct {
 }
 
 //  住院费用明细信息上传
-func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string) (string, string) {
+func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCustom, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, doctor_name string, doctor_number string) (string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -588,20 +588,20 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 		feedetailInfo["pric"] = item.Price                           // 单价
 		feedetailInfo["bilg_dept_codg"] = dept_code                  // 开单科室编码
 		feedetailInfo["bilg_dept_name"] = dept                       // 开单科室名称
-		feedetailInfo["bilg_dr_codg"] = doctor_id                    // 开单医生编码
-		feedetailInfo["bilg_dr_name"] = doctor
-		feedetailInfo["acord_dept_codg"] = ""       // 受单科室编码
-		feedetailInfo["acord_dept_name"] = ""       // 受单科室名称
-		feedetailInfo["orders_dr_code"] = doctor_id // 受单医生编码
-		feedetailInfo["orders_dr_name"] = doctor    // 受单医生姓名
-		feedetailInfo["chrg_bchno"] = chrg_bchno    // 收费批次号
-		feedetailInfo["dise_codg"] = ""             // 病种编码
-		feedetailInfo["rxno"] = ""                  // 处方号
-		feedetailInfo["rx_circ_flag"] = "0"         // 外购处方标志
-		feedetailInfo["sin_dos_dscr"] = ""          // 单次剂量描述
-		feedetailInfo["used_frqu_dscr"] = ""        // 使用频次描述
-		feedetailInfo["prd_days"] = "0"             // 周期天数
-		feedetailInfo["medc_way_dscr"] = ""         // 用药途径描述
+		feedetailInfo["bilg_dr_codg"] = doctor_number                // 开单医生编码
+		feedetailInfo["bilg_dr_name"] = doctor_name
+		feedetailInfo["acord_dept_codg"] = dept_code    // 受单科室编码
+		feedetailInfo["acord_dept_name"] = dept         // 受单科室名称
+		feedetailInfo["orders_dr_code"] = doctor_number // 受单医生编码
+		feedetailInfo["orders_dr_name"] = doctor_name   // 受单医生姓名
+		feedetailInfo["chrg_bchno"] = chrg_bchno        // 收费批次号
+		feedetailInfo["dise_codg"] = ""                 // 病种编码
+		feedetailInfo["rxno"] = ""                      // 处方号
+		feedetailInfo["rx_circ_flag"] = "0"             // 外购处方标志
+		feedetailInfo["sin_dos_dscr"] = ""              // 单次剂量描述
+		feedetailInfo["used_frqu_dscr"] = ""            // 使用频次描述
+		feedetailInfo["prd_days"] = "0"                 // 周期天数
+		feedetailInfo["medc_way_dscr"] = ""             // 用药途径描述
 		// 开单医师姓名
 
 		if item.HospApprFlag != -1 {
@@ -618,7 +618,7 @@ func ZHGdyb2301(psnNo string, mdtrtId string, hisPrescription []*models.NewCusto
 			feedetailInfo["hosp_appr_flag"] = "1" // 医院审批标志
 		}
 
-		feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式
+		//feedetailInfo["tcmdrug_used_way"] = "" // 中药使用方式
 		feedetailInfo["etip_flag"] = ""        // 外检标志
 		feedetailInfo["etip_hosp_code"] = ""   // 外检医院编码
 		feedetailInfo["dscg_tkdrug_flag"] = "" // 出院带药标志