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

conf/app.conf

@@ -45,7 +45,7 @@ appsecret="61ee2e6268497d5aa9de0b0187c39aea"
 
 
 [prod]
-org_id = 10188
+org_id = 9919
 mobile_token_expiration_second = 86400
 httpdomain = https://api.xt.kuyicloud.com
 sso_domain = https://sso.kuyicloud.com

controllers/sg/his_api_controller.go

@@ -71,7 +71,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/psn/info", &HisApiController{}, "get:GetPsnNcdsInfo")
 
 	beego.Router("/api/allopatry/get", &HisApiController{}, "get:GetAllopatry")
-	beego.Router("/api/comfirmallopatry/post", &HisApiController{}, "post:ComfirmAllopatry")
+	//beego.Router("/api/comfirmallopatry/post", &HisApiController{}, "post:ComfirmAllopatry")
 	beego.Router("/api/allopatry/refund", &HisApiController{}, "post:RefundAllopatry")
 
 }
@@ -9313,6 +9313,7 @@ func (c *HisApiController) ReversalData() {
 		fmt.Println(result)
 	}
 }
+
 func (c *HisApiController) GetAllopatry() {
 	year := c.GetString("year")
 	month := c.GetString("month")
@@ -9334,38 +9335,40 @@ func (c *HisApiController) GetAllopatry() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"result": res2,
-	})
+	fmt.Println(res2)
 
-}
-func (c *HisApiController) ComfirmAllopatry() {
-	year := c.GetString("year")
-	month := c.GetString("month")
-	admin_user_id, _ := c.GetInt64("admin_user_id")
-	adminUser := c.GetAdminUserInfo()
-	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
-	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
-	result, _ := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month)
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
-	} else {
-		fmt.Println(err)
-	}
-	userJSONBytes, _ := json.Marshal(dat)
-	var res2 models.Result3261
-	if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"result": res2,
-	})
+	result2, _ := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month, res2)
+	fmt.Println(result2)
 
 }
 
+//func (c *HisApiController) ComfirmAllopatry() {
+//	year := c.GetString("year")
+//	month := c.GetString("month")
+//	admin_user_id, _ := c.GetInt64("admin_user_id")
+//	adminUser := c.GetAdminUserInfo()
+//	miConfig, _ := service.FindMedicalInsuranceInfo(adminUser.CurrentOrgId)
+//	roles, _ := service.GetAdminUserInfoByID(adminUser.CurrentOrgId, admin_user_id)
+//	result, _ := service.Gdyb3261(miConfig.OrgName, roles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.SecretKey, year, month)
+//	var dat map[string]interface{}
+//	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+//		fmt.Println(dat)
+//	} else {
+//		fmt.Println(err)
+//	}
+//	userJSONBytes, _ := json.Marshal(dat)
+//	var res2 models.Result3261
+//	if err := json.Unmarshal(userJSONBytes, &res2); err != nil {
+//		utils.ErrorLog("解析失败：%v", err)
+//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+//		return
+//	}
+//	c.ServeSuccessJSON(map[string]interface{}{
+//		"result": res2,
+//	})
+//
+//}
+
 func (c *HisApiController) RefundAllopatry() {
 	//year := c.GetString("year")
 	//month := c.GetString("month")

models/yb_models.go

@@ -5,7 +5,14 @@ type Result3260 struct {
 	InfRefmsgid string `json:"inf_refmsgid"`
 	Infcode     int64  `json:"infcode"`
 	Output      struct {
-		Data []interface{} `json:"data"`
+		Data []struct {
+			Certno          string  `json:"certno"`
+			MdtrtId         string  `json:"mdtrt_id"`
+			MdtrtSetlTime   string  `json:"mdtrt_setl_time"`
+			SetlNo          string  `json:"setl_no"`
+			MedfeeSumamt    float64 `json:"medfee_sumamt"`
+			OptinsPaySumamt float64 `json:"optins_pay_sumamt"`
+		} `json:"data"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`
@@ -25,3 +32,12 @@ type Result3261 struct {
 	Signtype    interface{} `json:"signtype"`
 	WarnMsg     interface{} `json:"warn_msg"`
 }
+
+type CustomData struct {
+	Certno          string  `json:"certno"`
+	MdtrtId         string  `json:"mdtrt_id"`
+	MdtrtSetlTime   string  `json:"mdtrt_setl_time"`
+	SetlNo          string  `json:"setl_no"`
+	MedfeeSumamt    float64 `json:"medfee_sumamt"`
+	OptinsPaySumamt float64 `json:"optins_pay_sumamt"`
+}

service/gdyb_service.go

@@ -934,6 +934,7 @@ func Gdyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 	inputMessage["infno"] = "2204" // 交易编码
 
 	//chrg_bchno := timeFormat + strconv.FormatInt(int64(chrgBchno), 10)
+
 	for _, item := range customs {
 		feedetailInfo := make(map[string]interface{})
 		feedetailInfo["feedetl_sn"] = item.FeedetlSn
@@ -3864,7 +3865,7 @@ func Gdyb3260(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	}
 
 }
-func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string) (string, string) {
+func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, year string, month string, result3260 models.Result3260) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -3873,10 +3874,25 @@ func Gdyb3261(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	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"] = "3261" // 交易编码
-	inputData["trt_year"] = ""     // 就诊凭证编号
-	inputData["trt_month"] = ""    // 开始时间
-	inputData["startrow"] = "100"  // 人员姓名
+	inputMessage["infno"] = "3261"                      // 交易编码
+	inputData["trt_year"] = year                        // 就诊凭证编号
+	inputData["trt_month"] = month                      // 开始时间
+	inputData["startrow"] = len(result3260.Output.Data) // 人员姓名
+
+	feedetail := make([]map[string]interface{}, 0)
+
+	for _, item := range result3260.Output.Data {
+		feedetailInfo := make(map[string]interface{})
+		feedetailInfo["certno"] = item.Certno
+		feedetailInfo["mdtrt_id"] = item.MdtrtId                  // 就诊 ID（来自2201接口返回）
+		feedetailInfo["mdtrt_setl_time"] = item.MdtrtSetlTime     // 人员编号 （来自1101接口返回）
+		feedetailInfo["setl_no"] = item.SetlNo                    // 收费批次号
+		feedetailInfo["medfee_sumamt"] = item.MedfeeSumamt        // 病种编码
+		feedetailInfo["optins_pay_sumamt"] = item.OptinsPaySumamt // 处方号
+		feedetail = append(feedetail, feedetailInfo)
+	}
+	inputData["detail"] = feedetail // 人员姓名
+
 	input["data"] = inputData
 	inputMessage["input"] = input //交易输入
 	var inputLog string