更新

controllers/sg/his_api_controller.go

@@ -185,7 +185,7 @@ func HisManagerApiRegistRouters() {
 	beego.Router("/api/pc_bg", &HisApiController{}, "get:FJ3501AND3502")
 	//删除库盘和变更
 	beego.Router("/api/delete_pc_bg", &HisApiController{}, "get:DeletePCandBG")
-	beego.Router("/api/delete_xs_bg", &HisApiController{}, "get:DeleteXSandBG")
+	//beego.Router("/api/delete_xs_bg", &HisApiController{}, "get:DeleteXSandBG")
 	//药品变更
 	beego.Router("/api/changedrug", &HisApiController{}, "get:ChangeDrug")
 
@@ -537,74 +537,74 @@ func (c *HisApiController) DeletePCandBG() {
 
 }
 
-func (c *HisApiController) DeleteXSandBG() {
-	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)
-
-	drugs, _ := service.GetNewDrugWarehouseInfo(id_arr)
-	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
-	for _, item := range drugs {
-		if item.IsPc == 1 && item.IsBg == 1 {
-			var struct3507 models.Struct3507
-			struct3507.FixmedinsBchno =
-			struct3507.InvDataType = "1"
-			struct3507.Opter = roles.UserName
-			struct3507.OrgName = miConfig.OrgName
-			struct3507.AccessKey = miConfig.AccessKey
-			struct3507.RequestUrl = miConfig.Url
-			struct3507.SecretKey = miConfig.SecretKey
-			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
-			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-
-			struct3507.Url = miConfig.Url
-			struct3507.AppId = miConfig.Cainfo
-			struct3507.AppSecret = miConfig.AppSecret
-			struct3507.Enckey = miConfig.EncKey
-			struct3507.SignKey = miConfig.SignKey
-			struct3507.SecretKey = miConfig.SecretKey
-			struct3507.FixmedinsBchno = ""
-			struct3507.InvDataType = "1"
-
-			service.FJyb3507(struct3507)
-
-			var struct3507_2 models.Struct3507
-			struct3507_2.OrgName = miConfig.OrgName
-			struct3507_2.AccessKey = miConfig.AccessKey
-			struct3507_2.RequestUrl = miConfig.Url
-			struct3507_2.SecretKey = miConfig.SecretKey
-			struct3507_2.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
-			struct3507_2.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-			struct3507_2.FixmedinsBchno = ""
-			struct3507_2.InvDataType = "2"
-
-			struct3507_2.Url = miConfig.Url
-			struct3507_2.AppId = miConfig.Cainfo
-			struct3507_2.AppSecret = miConfig.AppSecret
-			struct3507_2.Enckey = miConfig.EncKey
-			struct3507_2.SignKey = miConfig.SignKey
-			struct3507_2.SecretKey = miConfig.SecretKey
-			struct3507_2.FixmedinsBchno = ""
-			struct3507_2.InvDataType = "1"
-			service.FJyb3507(struct3507_2)
-		}
-		if item.IsPc == 1 && item.IsBg == 0 {
-			var struct3507 models.Struct3507
-			struct3507.OrgName = miConfig.OrgName
-			struct3507.AccessKey = miConfig.AccessKey
-			struct3507.RequestUrl = miConfig.Url
-			struct3507.SecretKey = miConfig.SecretKey
-			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
-			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
-			struct3507.FixmedinsBchno = ""
-			struct3507.InvDataType = "1"
-			service.FJyb3507(struct3507)
-		}
-
-	}
-
-}
+//func (c *HisApiController) DeleteXSandBG() {
+//	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)
+//
+//	drugs, _ := service.GetNewDrugWarehouseInfo(id_arr)
+//	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+//	for _, item := range drugs {
+//		if item.IsPc == 1 && item.IsBg == 1 {
+//			var struct3507 models.Struct3507
+//			struct3507.FixmedinsBchno =item
+//			struct3507.InvDataType = "1"
+//			struct3507.Opter = roles.UserName
+//			struct3507.OrgName = miConfig.OrgName
+//			struct3507.AccessKey = miConfig.AccessKey
+//			struct3507.RequestUrl = miConfig.Url
+//			struct3507.SecretKey = miConfig.SecretKey
+//			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+//			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+//
+//			struct3507.Url = miConfig.Url
+//			struct3507.AppId = miConfig.Cainfo
+//			struct3507.AppSecret = miConfig.AppSecret
+//			struct3507.Enckey = miConfig.EncKey
+//			struct3507.SignKey = miConfig.SignKey
+//			struct3507.SecretKey = miConfig.SecretKey
+//			struct3507.FixmedinsBchno = ""
+//			struct3507.InvDataType = "1"
+//
+//			service.FJyb3507(struct3507)
+//
+//			var struct3507_2 models.Struct3507
+//			struct3507_2.OrgName = miConfig.OrgName
+//			struct3507_2.AccessKey = miConfig.AccessKey
+//			struct3507_2.RequestUrl = miConfig.Url
+//			struct3507_2.SecretKey = miConfig.SecretKey
+//			struct3507_2.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+//			struct3507_2.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+//			struct3507_2.FixmedinsBchno = ""
+//			struct3507_2.InvDataType = "2"
+//
+//			struct3507_2.Url = miConfig.Url
+//			struct3507_2.AppId = miConfig.Cainfo
+//			struct3507_2.AppSecret = miConfig.AppSecret
+//			struct3507_2.Enckey = miConfig.EncKey
+//			struct3507_2.SignKey = miConfig.SignKey
+//			struct3507_2.SecretKey = miConfig.SecretKey
+//			struct3507_2.FixmedinsBchno = ""
+//			struct3507_2.InvDataType = "1"
+//			service.FJyb3507(struct3507_2)
+//		}
+//		if item.IsPc == 1 && item.IsBg == 0 {
+//			var struct3507 models.Struct3507
+//			struct3507.OrgName = miConfig.OrgName
+//			struct3507.AccessKey = miConfig.AccessKey
+//			struct3507.RequestUrl = miConfig.Url
+//			struct3507.SecretKey = miConfig.SecretKey
+//			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+//			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+//			struct3507.FixmedinsBchno = ""
+//			struct3507.InvDataType = "1"
+//			service.FJyb3507(struct3507)
+//		}
+//
+//	}
+//
+//}
 
 func (c *HisApiController) ChangeDrug() {
 	ids := c.GetString("ids")
@@ -878,6 +878,7 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	struct3505.FixmedinsHilistId = miConfig.Code
 	struct3505.FixmedinsHilistName = miConfig.OrgName
 	struct3505.FixmedinsBchno = drug.NewDrugWarehouseInfo.Bchno
+	struct3505.Opter = role.UserName
 
 	struct3505.FixmedinsCode = miConfig.Code
 	roles, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
@@ -888,7 +889,7 @@ func SaleStock(org_id int64, pre models.HisPrescription, drug *models.DrugFlow,
 	struct3505.SetlId = order.SetlId
 	struct3505.MdtrtSn = order.MdtrtId
 	struct3505.ManuLotnum = drug.Number
-	struct3505.ManuDate = time.Unix(drug.ProductDate, 0).Format("2006-01-02 15:04:05")
+	struct3505.ManuDate = time.Unix(drug.ProductDate, 0).Format("2006-01-02")
 	struct3505.ExpyEnd = ""
 	struct3505.RxFlag = "0"
 	struct3505.TrdnFlag = "1"

models/new_stock_models.go

@@ -438,7 +438,7 @@ type DrugFlow struct {
 	OrderId                   int64                `gorm:"column:order_id" json:"order_id" form:"order_id"`
 	IsSale                    int64                `gorm:"column:is_sale" json:"is_sale" form:"is_sale"`
 	IsChange                  int64                `gorm:"column:is_change" json:"is_change" form:"is_change"`
-	NewDrugWarehouseInfo      NewDrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingId" json:"dw"`
+	NewDrugWarehouseInfo      NewDrugWarehouseInfo `gorm:"ForeignKey:ID;AssociationForeignKey:WarehousingDetailId" json:"dw"`
 	Bchno                     string               `gorm:"column:bchno" json:"bchno" form:"bchno"`
 	SaleDate                  string               `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
 }

service/fj_service.go

@@ -3113,7 +3113,7 @@ func FJyb3505(struct3505 models.Struct3505) (string, string, string) {
 	input := make(map[string]interface{})
 	inputData := make(map[string]interface{})
 	druginputData := make(map[string]interface{})
-	druginputData2 := make(map[string]interface{})
+	//druginputData2 := make(map[string]interface{})
 
 	inputMessage["infno"] = "3505"                                  // 交易编码
 	inputData["med_list_codg"] = struct3505.MedListCodg             // 定点医药机构目录编号
@@ -3157,10 +3157,12 @@ func FJyb3505(struct3505 models.Struct3505) (string, string, string) {
 	inputData["sel_retn_cnt"] = struct3505.SelRetnCnt              // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_time"] = struct3505.SelRetnTime            // 人员编号 （来自1101接口返回）
 	inputData["sel_retn_opter_name"] = struct3505.SelRetnOpterName // 人员编号 （来自1101接口返回）
-	inputData["memo"] = struct3505.Memo                            // 人员编号 （来自1101接口返回）
-	druginputData["drug_trac_codg"] = ""
-	druginputData2["drugtracinfo"] = druginputData
-	inputData["drug_trac_info"] = druginputData2
+	inputData["memo"] = struct3505.Memo
+	inputData["mdtrt_setl_type"] = struct3505.MdtrtSetlType                            // 人员编号 （来自1101接口返回）
+	// 人员编号 （来自1101接口返回）
+	//druginputData["drug_trac_codg"] = ""
+	//druginputData2["drugtracinfo"] = druginputData
+	inputData["drug_trac_info"] = druginputData
 
 	input["selinfo"] = inputData
 	inputMessage["input"] = input //交易输入
@@ -3235,6 +3237,8 @@ func FJyb3506(struct3506 models.Struct3506) (string, string, string) {
 	}
 
 	enc := mahonia.NewEncoder("gbk")
+	return "", "", ""
+
 	output, err_msg := GetFjBusinessHandleInfo([]byte(enc.ConvertString(string(bytesData))))
 	return output, requestLog, err_msg
 

service/his_service.go

@@ -1709,9 +1709,9 @@ func GetNewDrugWarehouseInfo(id_arr []string) (newDrugWarehouse []*models.NewDru
 }
 
 func GetNewDrugFlowInfo(id_arr []string) (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Where("org_id = ? and status = 1 and id in (?)", 10191, id_arr).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
-		return db.Where("status = 1").Preload("BaseDrugLib", "status=1").Preload("NewDrugWarehouseInfo", "status = 1")
-	}).Find(&flows).Error
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?)", 10191, id_arr).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+		return db.Where("status = 1").Preload("BaseDrugLib", "status=1")
+	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error
 	return
 }