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

controllers/sg/his_api_controller.go

@@ -97,7 +97,7 @@ func (c *HisApiController) GetSettleList() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeHisOrderNoExistParamWrong)
 		return
 	}
-	struct4101 := &service.Struct4101{
+	struct4101 := service.Struct4101{
 		PsnNo:          order.PsnNo,
 		MdtrtId:        order.MdtrtId,
 		SetlId:         order.SetlId,
@@ -166,6 +166,7 @@ func (c *HisApiController) GetSettleList() {
 	tempOpspdiseinfo.MaindiagFlag = "1"
 	tempOpspdiseinfo.OprnOprtCode = ""
 	tempOpspdiseinfo.OprnOprtName = ""
+
 	tempOpspdiseinfos = append(tempOpspdiseinfos, tempOpspdiseinfo)
 	tempOpspdiseinfo2.DiagCode = sickConfigTwo.CountryCode
 	tempOpspdiseinfo2.DiagName = sickConfigTwo.CountryContentName

service/gdyb_service.go

@@ -2158,7 +2158,7 @@ type Struct4101 struct {
 }
 
 //
-func Gdyb4101(struct4101 *Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
+func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
 	timestamp := time.Now().Unix()
@@ -2257,6 +2257,7 @@ func Gdyb4101(struct4101 *Struct4101, secret_key string, org_name string, doctor
 	payinfo := make([]map[string]interface{}, 0) // 基金支付信息
 	payinfotemp := make(map[string]interface{})
 	for _, item := range struct4101.CustomStruct {
+		fmt.Println(item.FundPayType)
 		payinfotemp["fund_pay_type"] = item.FundPayType // 基金支付类型  必填
 		payinfotemp["fund_payamt"] = item.FundPayamt    // 基金支付金额
 		payinfo = append(payinfo, payinfotemp)
@@ -2265,6 +2266,8 @@ func Gdyb4101(struct4101 *Struct4101, secret_key string, org_name string, doctor
 	opspdiseinfo := make([]map[string]interface{}, 0) // 门诊慢特病诊断信息
 	opspdiseinfotemp := make(map[string]interface{})
 	for _, item := range struct4101.OpspdiseinfoStruct {
+		fmt.Println(item.DiagName)
+
 		opspdiseinfotemp["diag_name"] = item.DiagName // 诊断名称  必填
 		opspdiseinfotemp["diag_code"] = item.DiagCode // 诊断代码 必填
 		opspdiseinfotemp["oprn_oprt_name"] = ""       // 手术操作名称 必填
@@ -2275,6 +2278,8 @@ func Gdyb4101(struct4101 *Struct4101, secret_key string, org_name string, doctor
 	diseinfo := make([]map[string]interface{}, 0) // 住院诊断信息
 	diseinfotemp := make(map[string]interface{})
 	for _, item := range struct4101.OpspdiseinfoStruct {
+		fmt.Println(item.DiagName)
+
 		diseinfotemp["diag_type"] = item.MaindiagFlag // 诊断类别  必填
 		diseinfotemp["diag_code"] = item.DiagCode     // 诊断代码 必填
 		diseinfotemp["diag_name"] = item.DiagName     // 诊断名称 必填
@@ -2285,6 +2290,8 @@ func Gdyb4101(struct4101 *Struct4101, secret_key string, org_name string, doctor
 	iteminfo := make([]map[string]interface{}, 0) // 住院诊断信息
 	iteminfotemp := make(map[string]interface{})
 	for _, item := range struct4101.IteminfoStruct {
+		fmt.Println(item.MedChrgitm)
+
 		iteminfotemp["med_chrgitm"] = item.MedChrgitm            // 医疗收费项目  必填
 		iteminfotemp["amt"] = item.Amt                           // 金额 必填
 		iteminfotemp["claa_sumfee"] = item.ClaaSumfee            // 甲类费用合计 必填