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

controllers/nm/nm_controller.go

@@ -143,7 +143,36 @@ type ResultTwo10265 struct {
 }
 
 func (c *NmController) Post4101() {
+	body, _ := ioutil.ReadAll(c.Ctx.Request.Body)
+	var respJSON map[string]interface{}
+	if err := json.Unmarshal([]byte(string(body)), &respJSON); err != nil {
+		utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+		return
+	}
+	struct4101UserJSONBytes, _ := json.Marshal(respJSON["struct4101"])
+	var struct4101 service.Struct4101
+	if err := json.Unmarshal(struct4101UserJSONBytes, &struct4101); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	ppUserJSONBytes, _ := json.Marshal(respJSON["pp"])
+	var pp models.PublicParams
+	if err := json.Unmarshal(ppUserJSONBytes, &pp); err != nil {
+		utils.ErrorLog("解析失败：%v", err)
+		return
+	}
+	result := service.Gdyb4101(struct4101, pp.SecretKey, pp.FixmedinsName, pp.OpterName, pp.FixmedinsCode, pp.InsuplcAdmdvs, pp.MdtrtareaAdmvs, 0)
+	var dat map[string]interface{}
+	if err := json.Unmarshal([]byte(result), &dat); err == nil {
+		fmt.Println(dat)
+	} else {
+		fmt.Println(err)
+	}
 
+	saveJsLog(result, "", "4101", "上传明细清单", pp.FixmedinsName)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"pre": dat,
+	})
 }
 
 func (c *NmController) Post2202() {

controllers/sg/his_api_controller.go

@@ -3534,33 +3534,80 @@ func (c *HisApiController) GetSettleListHospital() {
 	struct4101.IteminfoStruct = iteminfoStructs
 	struct4101.Ntly = "中国"
 	struct4101.AdmCaty = "A03.06"
-	result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.UserOrgId)
-	fmt.Println(result)
+	var resOther ResultSeventeenOther
+	var res ResultSeventeen
+	if miConfig.MdtrtareaAdmvs == "150499" {
+		var pp models.PublicParams
+		pp.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+		pp.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+		pp.FixmedinsName = miConfig.OrgName
+		pp.FixmedinsCode = miConfig.Code
+		pp.RequestUrl = miConfig.Url
+		pp.Cainfo = miConfig.Cainfo
+		pp.SecretKey = miConfig.SecretKey
+		pp.AccessKey = miConfig.AccessKey
+		pp.OpterName = curRoles.UserName
+		client := &http.Client{}
+		var req *http.Request
+		data := make(map[string]interface{})
+		data["struct4101"] = struct4101
+		data["pp"] = pp
+		bytesData, _ := json.Marshal(data)
+		req, _ = http.NewRequest("POST", "http://172.16.13.254:9532/"+"nmyb/4101", bytes.NewReader(bytesData))
+		resp, _ := client.Do(req)
+		defer resp.Body.Close()
+		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(body), &respJSON); err != nil {
+			utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 
-	var dat map[string]interface{}
-	if err := json.Unmarshal([]byte(result), &dat); err == nil {
-		fmt.Println(dat)
+		respJSON = respJSON["data"].(map[string]interface{})["pre"].(map[string]interface{})
+		userJSONBytes, _ := json.Marshal(respJSON)
+		if err := json.Unmarshal(userJSONBytes, &resOther); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
+		res.InfRefmsgid = resOther.InfRefmsgid
+		res.Output = resOther.Output
+		res.ErrMsg = resOther.ErrMsg
+		infocode, _ := strconv.ParseInt(resOther.Infcode, 10, 64)
+		res.Infcode = infocode
 	} else {
-		fmt.Println(err)
-	}
-	userJSONBytes, _ := json.Marshal(dat)
-	var res ResultSeventeen
-	if err := json.Unmarshal(userJSONBytes, &res); err != nil {
-		utils.ErrorLog("解析失败：%v", err)
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
+		result := service.Gdyb4101(struct4101, miConfig.SecretKey, miConfig.OrgName, curRoles.UserName, miConfig.Code, miConfig.InsuplcAdmdvs, miConfig.MdtrtareaAdmvs, miConfig.UserOrgId)
+		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)
+		if err := json.Unmarshal(userJSONBytes, &res); err != nil {
+			utils.ErrorLog("解析失败：%v", err)
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+			return
+		}
 	}
 	if res.Infcode != 0 {
-
 		c.ServeSuccessJSON(map[string]interface{}{
 			"failed_code": -10,
 			"msg":         res.ErrMsg,
 		})
 		return
 	} else {
-		order.FaPiaoNumber = zero
-		order.FaPiaoCode = last_order.FaPiaoCode
-		service.UpdateOrder(order)
+		if miConfig.MdtrtareaAdmvs != "150499" {
+			order.FaPiaoNumber = zero
+			order.FaPiaoCode = last_order.FaPiaoCode
+			service.UpdateOrder(order)
+		}
 		hisFundSettleListResult := &models.HisFundSettleListResult{
 			Number:    res.Output.SetlListId,
 			Status:    1,

service/gdyb_service.go

@@ -2884,7 +2884,6 @@ func Gdyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor
 		inputMessage["infno"] = "4101A" // 交易编码
 
 	}
-
 	year := time.Now().Format("2006")
 	month := time.Now().Format("01")
 	day := time.Now().Format("02")