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

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9531
+httpport = 9532
 runmode = dev
 
 #

controllers/base_api_controller.go

@@ -70,8 +70,8 @@ func (this *BaseAuthAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 558
-		userAdmin.Mobile = "13535547901"
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
 
 		//userAdmin.Id = 597
 		//userAdmin.Mobile = "19874122664"
@@ -92,7 +92,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 4
-		adminUserInfo.CurrentAppId = 18
+		adminUserInfo.CurrentAppId = 8642
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -316,8 +316,9 @@ func (this *BaseServeAPIController) Prepare() {
 	this.BaseAPIController.Prepare()
 	if this.GetAdminUserInfo() == nil {
 		var userAdmin models.AdminUser
-		userAdmin.Id = 558
-		userAdmin.Mobile = "13535547901"
+		userAdmin.Id = 1448
+		userAdmin.Mobile = "13318599895"
+
 		//userAdmin.Id = 597
 		//userAdmin.Mobile = "19874122664"
 		userAdmin.IsSuperAdmin = false
@@ -333,16 +334,14 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibe.Status = 1
 		subscibe.CreatedTime = 1538035409
 		subscibe.UpdatedTime = 1538035409
-
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 4
-		adminUserInfo.CurrentAppId = 18
+		adminUserInfo.CurrentAppId = 8642
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
-
 		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
 		//this.StopRun()
 	}

controllers/gdyb_controller.go

@@ -226,9 +226,15 @@ func (c *GdybController) PostSix() {
 	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
 
 	secret_key := c.GetString("secret_key")
+	fixmedins_code := c.GetString("fixmedins_code")
 
-	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key)
-
+	result := service.Gdyb2205(psnNo, mdtrtId, chrgBchno, org_name, doctor, insuplc_admdvs, mdtrtarea_admvs, secret_key, fixmedins_code)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})
@@ -291,8 +297,16 @@ func (c *GdybController) PostNine() {
 	org_name := c.GetString("org_name")
 	doctor := c.GetString("doctor")
 	secret_key := c.GetString("secret_key")
-
-	result := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key)
+	fixmedins_code := c.GetString("fixmedins_code")
+	insuplc_admdvs := c.GetString("insuplc_admdvs")
+	mdtrtarea_admvs := c.GetString("mdtrtarea_admvs")
+	result := service.Gdyb2208(psnNo, mdtrtId, setlId, org_name, doctor, secret_key, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
 	c.ServeSuccessJSON(map[string]interface{}{
 		"pre": result,
 	})

controllers/his_api_controller.go

@@ -57,13 +57,6 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/doctor/list", &HisApiController{}, "get:GetAdminUsers")
 
-	//beego.Router("/api/medicalinsurance/config", &HisApiController{}, "get:GetMedicalInsuranceConfig")
-
-	//新增附加费用
-	//beego.Router("/api/his/additionalcharge", &HisApiController{}, "Post:AdditionalCharge")
-
-	//beego.Router("/api/additionalcharge/get", &HisApiController{}, "Get:GetAdditionalcharge")
-
 	beego.Router("/api/hisprescription/get", &DialysisApiController{}, "Get:GetLastOrNextHisPrescription")
 
 	beego.Router("/api/callhisprescription/get", &DialysisApiController{}, "Get:GetCallHisPrescription")
@@ -2013,11 +2006,82 @@ func (c *HisApiController) GetUploadInfo() {
 func (c *HisApiController) Refund() {
 	order_id, _ := c.GetInt64("order_id")
 	number := c.GetString("number")
+	record_time := c.GetString("record_time")
+	patient_id, _ := c.GetInt64("patient_id")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
 
 	adminUser := c.GetAdminUserInfo()
+	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_time+" 00:00:00", loc)
+	if err != nil {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+	recordDateTime := theTime.Unix()
+
+	his, _ := service.GetVMHisPatientInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+	patientPrescription, _ := service.FindPatientPrescriptionInfo(adminUser.CurrentOrgId, patient_id, recordDateTime)
+	order, _ := service.GetHisOrderByID(order_id)
+
 	config, _ := service.GetMedicalInsuranceConfig(adminUser.CurrentOrgId)
 	if config.IsOpen == 1 { //对接了医保，走医保流程
+		api := "http://127.0.0.1:9531/" + "gdyb/nine?psn_no=" + his.PsnNo +
+			"&mdtrt_id=" + his.Number + "&doctor=" + patientPrescription.Doctor + "&setl_id=" + order.SetlId + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+		resp, requestErr := http.Get(api)
+		if requestErr != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		body, ioErr := ioutil.ReadAll(resp.Body)
+		if ioErr != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		var respJSON map[string]interface{}
+		if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		userJSONBytes, _ := json.Marshal(respJSON)
+		fmt.Println(respJSON)
+		fmt.Println(userJSONBytes)
+
+		api2 := "http://127.0.0.1:9531/" + "gdyb/six?psn_no=" + his.PsnNo +
+			"&mdtrt_id=" + his.Number + "&chrg_bchno=" + order.Number + "&doctor=" + patientPrescription.Doctor + "&org_name=" + miConfig.OrgName + "&fixmedins_code=" + miConfig.Code +
+			"&insuplc_admdvs=" + miConfig.InsuplcAdmdvs + "&mdtrtarea_admvs=" + miConfig.MdtrtareaAdmvs + "&secret_key=" + miConfig.SecretKey
+		resp2, requestErr2 := http.Get(api2)
+		if requestErr2 != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 
+		body2, ioErr2 := ioutil.ReadAll(resp2.Body)
+		if ioErr2 != nil {
+			utils.ErrorLog("接口返回数据读取失败: %v", ioErr2)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		var respJSON2 map[string]interface{}
+		if err := json.Unmarshal([]byte(string(body2)), &respJSON2); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
+		if err == nil {
+			c.ServeSuccessJSON(map[string]interface{}{
+				"msg": "退费成功",
+			})
+		} else {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 	} else {
 		err := service.UpdataOrderStatus(order_id, number, adminUser.CurrentOrgId)
 		if err == nil {
@@ -2028,9 +2092,7 @@ func (c *HisApiController) Refund() {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 			return
 		}
-
 	}
-
 }
 
 func (this *HisApiController) AdditionalCharge() {

main.go

@@ -12,10 +12,10 @@ func init() {
 }
 
 func main() {
-	service.BeginAutoCreateWeekSchedulesJob()
-	service.BeginAutoCreateWeekDisinfectionJob()
+	//service.BeginAutoCreateWeekSchedulesJob()
+	//service.BeginAutoCreateWeekDisinfectionJob()
 	//service.BeginAutoCreatePlanJob()
 	//service.AutoClearSchedules()
-	service.BeginAutoCreateStaffScheduleJob()
+	//service.BeginAutoCreateStaffScheduleJob()
 	beego.Run()
 }

service/gdyb_service.go

@@ -484,14 +484,14 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 }
 
 //  门诊费用明细信息撤销
-func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string) string {
+func Gdyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "", insuplc_admdvs, mdtrtarea_admvs)
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2205" // 交易编码
@@ -673,14 +673,14 @@ func Gdyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, ins
 }
 
 //  门诊结算撤销
-func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string) string {
+func Gdyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
 	signature := setSignature(timestamp, nonce, secret_key)
 
 	// 生成输入报文
-	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, "", "", "")
+	inputMessage := SetInputMessage(nonce, timestamp, org_name, doctor, fixmedins_code, insuplc_admdvs, mdtrtarea_admvs)
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "2208" // 交易编码

service/his_service.go

@@ -793,3 +793,8 @@ func GetCallHisPrescriptions(start_time int64, end_time int64, org_id int64, pat
 
 	return
 }
+
+func GetHisOrderByID(order_id int64) (order models.HisOrder, err error) {
+	err = readDb.Model(&models.HisOrder{}).Where("id = ?", order_id).First(&order).Error
+	return
+}