更新

controllers/sg/his_api_controller.go

@@ -38,7 +38,7 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
-
+	"github.com/go-ole/go-ole"
 	"github.com/go-ole/go-ole/oleutil"
 )
 
@@ -192,7 +192,7 @@ func HisManagerApiRegistRouters() {
 
 }
 func (c *HisApiController) FJ3501AND3502() {
-	ids := c.getString("ids")
+	ids := c.GetString("ids")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 
@@ -202,6 +202,7 @@ func (c *HisApiController) FJ3501AND3502() {
 	//库盘
 	for _, drug := range drugs {
 		if drug.IsPc == 0 && drug.IsBg == 0 {
+			number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(drug.ID, 10) + "-" + "3501"
 			var struct3501 models.Struct3501
 			struct3501.OrgName = miConfig.OrgName
 			struct3501.AccessKey = miConfig.AccessKey
@@ -217,17 +218,22 @@ func (c *HisApiController) FJ3501AND3502() {
 			struct3501.FixmedinsHilistId = miConfig.Code
 			struct3501.FixmedinsHilistName = miConfig.OrgName
 			struct3501.RxFlag = "0"
-			struct3501.Invdate = time.Unix(drug.Ctime, 0).Format("2006-01-02 15:04:05")
+			struct3501.Invdate = time.Unix(drug.Ctime, 0).Format("2006-01-02")
+			struct3501.ManuDate = time.Unix(drug.ProductDate, 0).Format("2006-01-02")
+
 			struct3501.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
 			struct3501.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
 			struct3501.InvCnt = strconv.FormatInt(drug.StockMaxNumber, 10)
-			struct3501.ExpyEnd = time.Unix(drug.ExpiryDate, 0).Format("2006-01-02 15:04:05")
-			struct3501.FixmedinsBchno = strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(drug.ID, 10) + "-" + "3501"
+			struct3501.ExpyEnd = time.Unix(drug.ExpiryDate, 0).Format("2006-01-02")
+			struct3501.FixmedinsBchno = number
 			memo := make(map[string]interface{})
 			memo["pric"] = drug.Price
 			bytesData, _ := json.Marshal(memo)
 			struct3501.Memo = string(bytesData)
 			result1, result2, result3 := service.FJyb3501(struct3501)
+			saveLog(result1, result2, "3501", "3501")
+			//saveLog(result, requestLog, "2201", "挂号")
+
 			fmt.Println(result1)
 			fmt.Println(result2)
 			fmt.Println(result3)
@@ -240,6 +246,7 @@ func (c *HisApiController) FJ3501AND3502() {
 			struct3502.RxFlag = "0"
 			struct3502.InvChgTime = time.Now().Format("2006-01-02")
 			struct3502.OrgName = miConfig.OrgName
+			struct3501.Opter = roles.UserName
 			struct3502.AccessKey = miConfig.AccessKey
 			struct3502.RequestUrl = miConfig.Url
 			struct3502.SecretKey = miConfig.SecretKey
@@ -255,13 +262,15 @@ func (c *HisApiController) FJ3501AND3502() {
 
 			struct3502.Memo = ""
 			struct3502.InvChgType = "108"
-			struct3501.FixmedinsBchno = strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(drug.ID, 10) + "-" + "3502"
+			struct3502.FixmedinsBchno = number
 			struct3502.Cnt = strconv.FormatInt(drug.WarehousingCount, 10)
 			struct3502.Pric = fmt.Sprintf("%.2f", drug.BaseDrugLib.RetailPrice)
 			result11, result22, result33 := service.FJyb3502(struct3502)
 			fmt.Println(result11)
 			fmt.Println(result22)
 			fmt.Println(result33)
+			saveLog(result11, result22, "3502", "3502")
+
 
 		}
 		//变更
@@ -271,6 +280,7 @@ func (c *HisApiController) FJ3501AND3502() {
 			struct3502.FixmedinsHilistId = miConfig.Code
 			struct3502.FixmedinsHilistName = miConfig.OrgName
 			struct3502.FixmedinsCode = miConfig.Code
+			struct3502.Opter = roles.UserName
 			struct3502.RxFlag = "0"
 			struct3502.InvChgTime = time.Unix(drug.Ctime, 0).Format("2006-01-02 15:04:05")
 			struct3502.OrgName = miConfig.OrgName
@@ -288,10 +298,11 @@ func (c *HisApiController) FJ3501AND3502() {
 			struct3502.SignKey = miConfig.SignKey
 			struct3502.SecretKey = miConfig.SecretKey
 
-			struct3502.FixmedinsBchno = ""
+			struct3502.FixmedinsBchno = drug.Bchno
 			struct3502.Cnt = strconv.FormatInt(drug.WarehousingCount, 10)
 			struct3502.Pric = fmt.Sprintf("%.2f", drug.BaseDrugLib.RetailPrice)
 			result1, result2, result3 := service.FJyb3502(struct3502)
+			saveLog(result1, result2, "3502", "3502")
 			fmt.Println(result1)
 			fmt.Println(result2)
 			fmt.Println(result3)
@@ -299,7 +310,7 @@ func (c *HisApiController) FJ3501AND3502() {
 	}
 }
 func (c *HisApiController) DeletePCandBG() {
-	ids := c.getString("ids")
+	ids := c.GetString("ids")
 	id_arr := strings.Split(ids, ",")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
@@ -371,7 +382,7 @@ func (c *HisApiController) DeletePCandBG() {
 }
 
 func (c *HisApiController) DeleteXSandBG() {
-	ids := c.getString("ids")
+	ids := c.GetString("ids")
 	id_arr := strings.Split(ids, ",")
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
@@ -440,7 +451,7 @@ func (c *HisApiController) DeleteXSandBG() {
 }
 
 func (c *HisApiController) ChangeDrug() {
-	ids := c.getString("ids")
+	ids := c.GetString("ids")
 	id_arr := strings.Split(ids, ",")
 	flows, _ := service.GetNewDrugFlowInfo(id_arr)
 	admin_user_id, _ := c.GetInt64("admin_user_id")

main.go

@@ -26,13 +26,13 @@ import (
 func init() {
 	//service.ConnectNMMSDB()
 	service.ConnectDB()
-	//org_id, _ := beego.AppConfig.Int64("org_id")
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	//////CreateLog(miConfig)
-	//////UploadLog(miConfig)31
-	//if org_id == 10191 {
-	//	service.GetFjAuthorizationInfo(miConfig.Code)
-	//}
+	org_id, _ := beego.AppConfig.Int64("org_id")
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	////CreateLog(miConfig)
+	////UploadLog(miConfig)31
+	if org_id == 10191 {
+		service.GetFjAuthorizationInfo(miConfig.Code)
+	}
 
 
 

models/new_stock_models.go

@@ -263,6 +263,9 @@ type NewDrugWarehouseInfo struct {
 
 	IsPc int64 `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
 	IsBg int64 `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
+	Bchno string `gorm:"column:bchno" json:"bchno" form:"bchno"`
+
+
 }
 
 func (NewDrugWarehouseInfo) TableName() string {

service/fj_service.go

@@ -1006,7 +1006,7 @@ func FJyb6201(org_name string, doctor string, fixmedins_code string, insuplc_adm
 }
 
 // 医药机构费用结算对总账 func Gdyb3201( org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
-func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams, med string, fund string) (string, string, string) {
+func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams, med string, fund string,acct string) (string, string, string) {
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
@@ -1040,7 +1040,7 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 	inputData["stmt_enddate"] = businessParams.StmtEnddate            //对帐结束时间
 	inputData["medfee_sumamt"] = med                                  //医疗费总额
 	inputData["fund_pay_sumamt"] = fund                               //基金支付总额
-	inputData["acct_pay"] = businessParams.AcctPay                    //个人账户支付金额
+	inputData["acct_pay"] = acct                    //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
 	inputData["refd_setl_flag"] = "0"                                 // 就诊 ID（来自2201接口返回）
 
@@ -3037,7 +3037,7 @@ func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
 	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
 	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3501.Memo                             // 人员编号 （来自1101接口返回）
-	druginputData["drug_trac_codg"] = "123"
+	druginputData["drug_trac_codg"] = "12345678912345678901"
 	//druginputData2["drugtracinfo"] = druginputData
 	inputData["drug_trac_info"] = druginputData
 	input["invinfo"] = inputData
@@ -3054,7 +3054,6 @@ func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
 
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
-
 	return output, requestLog, err_msg
 }
 
@@ -3070,31 +3069,23 @@ func FJyb3502(struct3502 models.Struct3502) (string, string, string) {
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	druginputData := make(map[string]interface{})
-	druginputData2 := make(map[string]interface{})
-
 	inputMessage["infno"] = "3502"                      // 交易编码
 	inputData["med_list_codg"] = struct3502.MedListCodg // 定点医药机构目录编号
 	inputData["inv_chg_type"] = struct3502.InvChgType   // 定点医药机构目录编号
-
 	inputData["fixmedins_hilist_id"] = struct3502.FixmedinsCode // 定点医药机构目录编号
 	inputData["fixmedins_hilist_name"] = struct3502.OrgName     // 定点医药机构目录名称
 	inputData["fixmedins_bchno"] = struct3502.FixmedinsBchno    // 人员编号 （来自1101接口返回）
 	inputData["pric"] = struct3502.Pric                         // 人员编号 （来自1101接口返回）
 	inputData["cnt"] = struct3502.Cnt                           // 人员编号 （来自1101接口返回）
 	inputData["rx_flag"] = struct3502.RxFlag                    //
-
 	inputData["inv_chg_time"] = struct3502.InvChgTime // 人员编号 （来自1101接口返回）
 	inputData["inv_chg_opter_name"] = ""              // 人员编号 （来自1101接口返回）
 	inputData["memo"] = struct3502.Memo               // 人员编号 （来自1101接口返回）
 	inputData["trdn_flag"] = ""                       // 人员编号 （来自1101接口返回）
-
-	druginputData["drug_trac_codg"] = ""
-	druginputData2["drugtracinfo"] = druginputData
-	inputData["drug_trac_info"] = druginputData2
-
+	druginputData["drug_trac_codg"] = "12345678912345678901"
+	inputData["drug_trac_info"] = druginputData
 	input["invinfo"] = inputData
 	inputMessage["input"] = input //交易输入
-
 	bytesData, err := json.Marshal(inputMessage)
 	var requestLog string
 	//bytesData, err := json.Marshal(inputMessage)
@@ -3104,7 +3095,6 @@ func FJyb3502(struct3502 models.Struct3502) (string, string, string) {
 		fmt.Println(err.Error())
 		return err.Error(), "", ""
 	}
-
 	enc := mahonia.NewEncoder("gbk")
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	return output, requestLog, err_msg