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

controllers/sg/his_api_controller.go

@@ -12,9 +12,7 @@ import (
 	//"crypto/x509/pkix"
 	"encoding/json"
 	"fmt"
-	//"github.com/tjfoc/gmsm/sm2"
-	//"github.com/tjfoc/gmsm/sm3"
-	"github.com/go-ole/go-ole"
+
 	"gdyb/controllers"
 	"gdyb/enums"
 	"gdyb/models"
@@ -184,7 +182,349 @@ func HisManagerApiRegistRouters() {
 
 	beego.Router("/api/settlelist/get/batch", &HisApiController{}, "get:GetbatchSettleList")
 
+	//库盘和变更
+	beego.Router("/api/pc_bg", &HisApiController{}, "get:FJ3501AND3502")
+	//删除库盘和变更
+	beego.Router("/api/delete_pc_bg", &HisApiController{}, "get:DeletePCandBG")
+	beego.Router("/api/delete_pc_bg", &HisApiController{}, "get:DeleteXSandBG")
+	//药品变更
+	beego.Router("/api/changedrug", &HisApiController{}, "get:ChangeDrug")
+
+}
+func (c *HisApiController) FJ3501AND3502() {
+	ids := c.getString("ids")
+	id_arr := strings.Split(ids, ",")
+	drugs, _ := service.GetNewDrugWarehouseInfo(id_arr)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	//库盘
+	for _, drug := range drugs {
+		if drug.IsPc == 0 && drug.IsBg == 0 {
+			var struct3501 models.Struct3501
+			struct3501.OrgName = miConfig.OrgName
+			struct3501.AccessKey = miConfig.AccessKey
+			struct3501.RequestUrl = miConfig.Url
+			struct3501.SecretKey = miConfig.SecretKey
+			struct3501.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
+			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.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")
+			//todo 批次号规则需要在咨询下保健
+			struct3501.FixmedinsBchno = ""
+			struct3501.Memo = ""
+			result1, result2, result3 := service.FJyb3501(struct3501)
+			fmt.Println(result1)
+			fmt.Println(result2)
+			fmt.Println(result3)
+
+			var struct3502 models.Struct3502
+			struct3502.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
+			struct3502.FixmedinsHilistId = miConfig.Code
+			struct3502.FixmedinsHilistName = miConfig.OrgName
+			struct3502.FixmedinsCode = miConfig.Code
+			struct3502.RxFlag = "0"
+			struct3502.InvChgTime = time.Unix(drug.Ctime, 0).Format("2006-01-02 15:04:05")
+			struct3502.OrgName = miConfig.OrgName
+			struct3502.AccessKey = miConfig.AccessKey
+			struct3502.RequestUrl = miConfig.Url
+			struct3502.SecretKey = miConfig.SecretKey
+			struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+			struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+			struct3502.InvChgType = "102"
+			struct3502.FixmedinsBchno = ""
+			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)
+
+		}
+		//变更
+		if drug.IsPc == 1 && drug.IsBg == 0 {
+			var struct3502 models.Struct3502
+			struct3502.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
+			struct3502.FixmedinsHilistId = miConfig.Code
+			struct3502.FixmedinsHilistName = miConfig.OrgName
+			struct3502.FixmedinsCode = miConfig.Code
+			struct3502.RxFlag = "0"
+			struct3502.InvChgTime = time.Unix(drug.Ctime, 0).Format("2006-01-02 15:04:05")
+			struct3502.OrgName = miConfig.OrgName
+			struct3502.AccessKey = miConfig.AccessKey
+			struct3502.RequestUrl = miConfig.Url
+			struct3502.SecretKey = miConfig.SecretKey
+			struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+			struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+			struct3502.InvChgType = "102"
+			struct3502.FixmedinsBchno = ""
+			struct3502.Cnt = strconv.FormatInt(drug.WarehousingCount, 10)
+			struct3502.Pric = fmt.Sprintf("%.2f", drug.BaseDrugLib.RetailPrice)
+			result1, result2, result3 := service.FJyb3502(struct3502)
+			fmt.Println(result1)
+			fmt.Println(result2)
+			fmt.Println(result3)
+		}
+	}
+}
+func (c *HisApiController) DeletePCandBG() {
+	ids := c.getString("ids")
+	id_arr := strings.Split(ids, ",")
+	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.OrgName = miConfig.OrgName
+			struct3507.AccessKey = miConfig.AccessKey
+			struct3507.RequestUrl = miConfig.Url
+			struct3507.SecretKey = miConfig.SecretKey
+			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+			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"
+			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, ",")
+	drugs, _ := service.GetNewDrugWarehouseInfo(id_arr)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	for _, item := range drugs {
+		if item.is == 1 && item.IsBg == 1 {
+			var struct3507 models.Struct3507
+			struct3507.FixmedinsBchno = ""
+			struct3507.InvDataType = "1"
+			struct3507.OrgName = miConfig.OrgName
+			struct3507.AccessKey = miConfig.AccessKey
+			struct3507.RequestUrl = miConfig.Url
+			struct3507.SecretKey = miConfig.SecretKey
+			struct3507.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+			struct3507.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+			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"
+			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")
+	id_arr := strings.Split(ids, ",")
+	flows, _ := service.GetNewDrugFlowInfo(id_arr)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+
+	for _, item := range flows {
+		if item.ConsumableType == 3 { //3为自动出库 7为自动退库
+			prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
+			if prescription.OrderStatus == 2 { //已经结算
+				//判断是否已经销售
+				if item.IsSale == 1 { //是否已经销售，1是   0否
+					//是否已经变更 1是  0否
+					if item.IsChange == 0 { //没变更，进行变更操作
+						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+					}
+				} else { //没销售，
+					//进行商品销售接口
+					SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item.HisDoctorAdviceInfo, miConfig, "")
+
+					if item.IsChange == 0 { //没变更，进行变更操作
+						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+					}
+				}
+			} else { //还没结算
+				if item.IsChange == 0 { //没变更，进行变更操作
+					ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+
+				}
+			}
+		} else if item.ConsumableType == 7 {
+			prescription := service.GetHisPrescriptionByID(item.HisDoctorAdviceInfo.PrescriptionId)
+			order := service.GetHisOrderByNumber(prescription.BatchNumber)
+
+			if order.OrderStatus == 2 || order.OrderStatus == 1 { //已经结算
+				//判断是否已经销售
+				if item.IsSale == 1 { //是否已经销售，1是   0否
+					//是否已经变更 1是  0否
+					if item.IsChange == 0 { //没变更，进行变更操作
+						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+					}
+				} else { //没销售，
+					//进行商品销售退货接口
+					CancleSaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item.HisDoctorAdviceInfo, miConfig, "")
+					if item.IsChange == 0 { //没变更，进行变更操作
+						ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+					}
+				}
+			} else { //还没结算
+				if item.IsChange == 0 { //没变更，进行变更操作
+					ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+
+				}
+			}
+
+		} else { //其他方式
+			if item.IsChange == 0 { //没变更，进行变更操作
+				ChangeStock(item.Count, item.HisDoctorAdviceInfo, miConfig, "102")
+			}
+		}
+	}
 }
+
+func ChangeStock(count int64, drug models.HisDoctorAdviceInfo, miConfig models.MedicalInsuranceOrgConfig, chgType string) {
+	var struct3502 models.Struct3502
+	struct3502.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
+	struct3502.FixmedinsHilistId = miConfig.Code
+	struct3502.FixmedinsHilistName = miConfig.OrgName
+	struct3502.FixmedinsCode = miConfig.Code
+	struct3502.RxFlag = "0"
+	struct3502.InvChgTime = time.Unix(drug.CreatedTime, 0).Format("2006-01-02 15:04:05")
+	struct3502.OrgName = miConfig.OrgName
+	struct3502.AccessKey = miConfig.AccessKey
+	struct3502.RequestUrl = miConfig.Url
+	struct3502.SecretKey = miConfig.SecretKey
+	struct3502.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3502.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	struct3502.InvChgType = chgType
+	struct3502.FixmedinsBchno = ""
+	struct3502.Cnt = strconv.FormatInt(count, 10)
+	struct3502.Pric = fmt.Sprintf("%.2f", drug.Price)
+	result1, result2, result3 := service.FJyb3502(struct3502)
+	fmt.Println(result1)
+	fmt.Println(result2)
+	fmt.Println(result3)
+
+}
+func SaleStock(org_id int64, pre models.HisPrescription, drug models.HisDoctorAdviceInfo, miConfig models.MedicalInsuranceOrgConfig, chgType string) {
+	var struct3505 models.Struct3505
+	struct3505.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
+	struct3505.FixmedinsHilistId = miConfig.Code
+	struct3505.FixmedinsHilistName = miConfig.OrgName
+	struct3505.FixmedinsCode = miConfig.Code
+	struct3505.FixmedinsBchno = ""
+	roles, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
+	struct3505.PrscDrName = roles.UserName
+	struct3505.PharName = ""
+	struct3505.PharPracCertNo = ""
+	order := service.GetHisOrderByNumber(pre.BatchNumber)
+	struct3505.SetlId = order.SetlId
+	struct3505.MdtrtSn = order.MdtrtId
+	struct3505.ManuLotnum = ""
+	struct3505.ManuDate = ""
+	struct3505.ExpyEnd = ""
+	struct3505.RxFlag = "0"
+	struct3505.TrdnFlag = "1"
+	struct3505.RtalDocno = order.Number
+	strValue := fmt.Sprintf("%.2f", drug.PrescribingNumber)
+	struct3505.SelRetnCnt = strValue
+	struct3505.SelRetnTime = time.Unix(drug.CreatedTime, 0).Format("2006-01-02 15:04:05")
+	roles_two, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
+
+	struct3505.SelRetnOpterName = roles_two.UserName
+	if order.IsMedicineInsurance == 1 {
+		struct3505.MdtrtSetlType = "1"
+	} else {
+		struct3505.MdtrtSetlType = "2"
+	}
+	struct3505.OrgName = miConfig.OrgName
+	struct3505.AccessKey = miConfig.AccessKey
+	struct3505.RequestUrl = miConfig.Url
+	struct3505.SecretKey = miConfig.SecretKey
+	struct3505.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3505.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	result1, result2, result3 := service.FJyb3505(struct3505)
+	fmt.Println(result1)
+	fmt.Println(result2)
+	fmt.Println(result3)
+
+}
+func CancleSaleStock(org_id int64, pre models.HisPrescription, drug models.HisDoctorAdviceInfo, miConfig models.MedicalInsuranceOrgConfig, chgType string) {
+	var struct3506 models.Struct3506
+	struct3506.MedListCodg = drug.BaseDrugLib.MedicalInsuranceNumber
+	struct3506.FixmedinsHilistId = miConfig.Code
+	struct3506.FixmedinsHilistName = miConfig.OrgName
+	struct3506.FixmedinsCode = miConfig.Code
+	struct3506.FixmedinsBchno = ""
+	order := service.GetHisOrderByNumber(pre.BatchNumber)
+	//roles, _ := service.GetAdminUserInfoByID(org_id, pre.Creator)
+	struct3506.ManuLotnum = ""
+	struct3506.ManuDate = ""
+	struct3506.MdtrtSn = order.MdtrtId
+	struct3506.ExpyEnd = ""
+	struct3506.RxFlag = "0"
+	struct3506.TrdnFlag = "1"
+	strValue := fmt.Sprintf("%.2f", drug.PrescribingNumber)
+	struct3506.SelRetnCnt = strValue
+	struct3506.SelRetnTime = time.Unix(drug.CreatedTime, 0).Format("2006-01-02 15:04:05")
+	roles_two, _ := service.GetAdminUserInfoByID(org_id, order.Creator)
+	struct3506.SelRetnOpterName = roles_two.UserName
+	struct3506.OrgName = miConfig.OrgName
+	struct3506.AccessKey = miConfig.AccessKey
+	struct3506.RequestUrl = miConfig.Url
+	struct3506.SecretKey = miConfig.SecretKey
+	struct3506.MdtrtareaAdmvs = miConfig.MdtrtareaAdmvs
+	struct3506.InsuplcAdmdvs = miConfig.InsuplcAdmdvs
+	result1, result2, result3 := service.FJyb3506(struct3506)
+	fmt.Println(result1)
+	fmt.Println(result2)
+	fmt.Println(result3)
+
+}
+
 func (c *HisApiController) Get1318() {
 	adminUser := c.GetAdminUserInfo()
 	admin_user_id, _ := c.GetInt64("admin_user_id")
@@ -4480,19 +4820,19 @@ func (c *HisApiController) ReadEleToken() {
 					Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
 					infoStr := string(Iinfos)
 					idetinfoStr := string(Idetinfos)
-				  //date,age,_  :=  GetBirthdateAndAge(res.Output.Baseinfo.Certno),
-						b,age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
+					//date,age,_  :=  GetBirthdateAndAge(res.Output.Baseinfo.Certno),
+					b, age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
 
 					psn := &models.HisPsn{
-						PsnNo: res.Output.Baseinfo.PsnNo,
-						PatientId: patient.ID,
-						Certno:    res.Output.Baseinfo.Certno,
+						PsnNo:        res.Output.Baseinfo.PsnNo,
+						PatientId:    patient.ID,
+						Certno:       res.Output.Baseinfo.Certno,
 						Gend:         res.Output.Baseinfo.Gend,
 						Naty:         res.Output.Baseinfo.Naty,
 						PsnCertType:  res.Output.Baseinfo.PsnCertType,
 						PsnName:      res.Output.Baseinfo.PsnName,
-						Age:float64(age),
-						Brdy:b,
+						Age:          float64(age),
+						Brdy:         b,
 						Idetinfo:     idetinfoStr,
 						Insuinfo:     infoStr,
 						UserOrgId:    c.GetAdminUserInfo().CurrentOrgId,
@@ -8244,14 +8584,14 @@ func (c *HisApiController) ReadCard() {
 					Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
 					infoStr := string(Iinfos)
 					idetinfoStr := string(Idetinfos)
-					b,age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
+					b, age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
 
 					psn := &models.HisPsn{
-						PsnNo: res.Output.Baseinfo.PsnNo,
-						PatientId: patient.ID,
-						Certno:    res.Output.Baseinfo.Certno,
+						PsnNo:       res.Output.Baseinfo.PsnNo,
+						PatientId:   patient.ID,
+						Certno:      res.Output.Baseinfo.Certno,
 						Brdy:        b,
-						Age:float64(age),
+						Age:         float64(age),
 						Gend:        res.Output.Baseinfo.Gend,
 						Naty:        res.Output.Baseinfo.Naty,
 						PsnCertType: res.Output.Baseinfo.PsnCertType,
@@ -8420,14 +8760,14 @@ func (c *HisApiController) ReadCard() {
 							Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
 							infoStr := string(Iinfos)
 							idetinfoStr := string(Idetinfos)
-							b,age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
+							b, age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
 
 							psn := &models.HisPsn{
-								PsnNo: res.Output.Baseinfo.PsnNo,
-								PatientId: patient.ID,
-								Certno:    res.Output.Baseinfo.Certno,
+								PsnNo:        res.Output.Baseinfo.PsnNo,
+								PatientId:    patient.ID,
+								Certno:       res.Output.Baseinfo.Certno,
 								Brdy:         b,
-								Age:float64(age),
+								Age:          float64(age),
 								Gend:         res.Output.Baseinfo.Gend,
 								Naty:         res.Output.Baseinfo.Naty,
 								PsnCertType:  res.Output.Baseinfo.PsnCertType,
@@ -10383,14 +10723,14 @@ func (c *HisApiController) ReadCard() {
 						Idetinfos, _ := json.Marshal(res.Output.Idetinfo)
 						infoStr := string(Iinfos)
 						idetinfoStr := string(Idetinfos)
-						b,age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
+						b, age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
 
 						psn := &models.HisPsn{
 							PsnNo:     res.Output.Baseinfo.PsnNo,
 							PatientId: patient.ID,
 							Certno:    res.Output.Baseinfo.Certno,
-							Brdy:        b,
-							Age:float64(age),
+							Brdy:      b,
+							Age:       float64(age),
 							//Brdy: res.Output.Baseinfo.Brdy,
 							Gend:         res.Output.Baseinfo.Gend,
 							Naty:         res.Output.Baseinfo.Naty,
@@ -11816,14 +12156,14 @@ func (c *HisApiController) ReadCard() {
 						infoStr := string(Iinfos)
 						idetinfoStr := string(Idetinfos)
 
-						b,age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
+						b, age, _ := getBirthdateAndAge(res.Output.Baseinfo.Certno)
 						psn := &models.HisPsn{
-							PsnNo:     res.Output.Baseinfo.PsnNo,
-							PatientId: patient.ID,
-							Certno:    res.Output.Baseinfo.Certno,
-							Gend:      res.Output.Baseinfo.Gend,
-							Brdy:        b,
-							Age:float64(age),
+							PsnNo:        res.Output.Baseinfo.PsnNo,
+							PatientId:    patient.ID,
+							Certno:       res.Output.Baseinfo.Certno,
+							Gend:         res.Output.Baseinfo.Gend,
+							Brdy:         b,
+							Age:          float64(age),
 							Naty:         res.Output.Baseinfo.Naty,
 							PsnCertType:  res.Output.Baseinfo.PsnCertType,
 							PsnName:      res.Output.Baseinfo.PsnName,
@@ -17663,12 +18003,12 @@ type ResultCFYLJG007 struct {
 	InfRefmsgid string `json:"inf_refmsgid"`
 	Infcode     int64  `json:"infcode"`
 	Output      struct {
-		HiRxno           string        `json:"hi_rxno"`
-		RxStasName       string        `json:"rx_stas_name"`
-		RxUsedStasCodg   string        `json:"rx_used_stas_codg"`
-		Seltdelts        []interface{} `json:"seltdelts"`
-		RxUsedStasName   string        `json:"rx_used_stas_name"`
-		RxStasCodg       string        `json:"rx_stas_codg"`
+		HiRxno         string        `json:"hi_rxno"`
+		RxStasName     string        `json:"rx_stas_name"`
+		RxUsedStasCodg string        `json:"rx_used_stas_codg"`
+		Seltdelts      []interface{} `json:"seltdelts"`
+		RxUsedStasName string        `json:"rx_used_stas_name"`
+		RxStasCodg     string        `json:"rx_stas_codg"`
 	} `json:"output"`
 	RefmsgTime  string      `json:"refmsg_time"`
 	RespondTime string      `json:"respond_time"`
@@ -17801,7 +18141,7 @@ type ResultCFYLJG005 struct {
 			SinDosunt       string  `json:"sin_dosunt"`
 			UsedFrquCodg    string  `json:"used_frqu_codg"`
 			UsedFrquName    string  `json:"used_frqu_name"`
-			DrugTotlcnt     string `json:"drug_totlcnt"`
+			DrugTotlcnt     string  `json:"drug_totlcnt"`
 			DrugTotlcntEmp  string  `json:"drug_totlcnt_emp"`
 			DiseCodg        string  `json:"dise_codg"`
 			HospApprFlag    string  `json:"hosp_appr_flag"`
@@ -21801,8 +22141,8 @@ func (c *HisApiController) GetUploadInfo() {
 							order.Creator = order.Creator
 							order.Modify = roles.AdminUserId
 							order.RequestLog = src_resquest
-						order.FaPiaoNumber =         fapiao_number
-							order.FaPiaoCode =           fapiao_code
+							order.FaPiaoNumber = fapiao_number
+							order.FaPiaoCode = fapiao_code
 							//setlDetail, _ := json.Marshal(res.Output.Setldetail)
 							//detailStr := string(setlDetail)
 							//order.SetlDetail = detailStr
@@ -22923,8 +23263,8 @@ func (c *HisApiController) GetUploadInfo() {
 				order.Modify = roles.AdminUserId
 				order.RequestLog = src_resquest
 				order.Diagnosis = diagnosis_id
-				order.FaPiaoNumber =         fapiao_number
-				order.FaPiaoCode =           fapiao_code
+				order.FaPiaoNumber = fapiao_number
+				order.FaPiaoCode = fapiao_code
 				setlDetail, _ := json.Marshal(res.Output.Setldetail)
 				detailStr := string(setlDetail)
 				order.SetlDetail = detailStr
@@ -34133,7 +34473,6 @@ func RemoveRepeatedPurviewElement2(arr []string) (newArr []string) {
 	return
 }
 
-
 func getBirthdateAndAge(idNumber string) (string, int, error) {
 	if len(idNumber) != 18 {
 		return "", 0, fmt.Errorf("invalid ID number length. It should be 18 digits")

models/models_3501.go

@@ -160,6 +160,7 @@ type Struct3505 struct {
 	RequestUrl          string
 	AccessKey           string
 	Cainfo              string
+	MdtrtSetlType       string
 }
 type Struct3506 struct {
 	MedListCodg         string
@@ -192,6 +193,7 @@ type Struct3506 struct {
 	RequestUrl          string
 	AccessKey           string
 	Cainfo              string
+	MdtrtSn             string
 }
 type Struct3507 struct {
 	FixmedinsBchno string

models/new_stock_models.go

@@ -260,6 +260,9 @@ type NewDrugWarehouseInfo struct {
 	StorehouseId              int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	SecondWarehouseInfoId     int64  `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
 	IsCheck                   int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+
+	IsPc int64 `gorm:"column:is_pc" json:"is_pc" form:"is_pc"`
+	IsBg int64 `gorm:"column:is_bg" json:"is_bg" form:"is_bg"`
 }
 
 func (NewDrugWarehouseInfo) TableName() string {
@@ -377,3 +380,64 @@ type NewDrugCancelStockInfo struct {
 func (NewDrugCancelStockInfo) TableName() string {
 	return "xt_drug_cancel_stock_info"
 }
+
+type DrugFlow struct {
+	ID                        int64               `gorm:"column:id" json:"id" form:"id"`
+	WarehousingId             int64               `gorm:"column:warehousing_id" json:"warehousing_id" form:"warehousing_id"`
+	DrugId                    int64               `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	Number                    string              `gorm:"column:number" json:"number" form:"number"`
+	BatchNumber               string              `gorm:"column:batch_number" json:"batch_number" form:"batch_number"`
+	Count                     int64               `gorm:"column:count" json:"count" form:"count"`
+	UserOrgId                 int64               `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                 int64               `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	SystemTime                int64               `gorm:"column:system_time" json:"system_time" form:"system_time"`
+	ConsumableType            int64               `gorm:"column:consumable_type" json:"consumable_type" form:"consumable_type"`
+	IsSys                     int64               `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
+	WarehousingOrder          string              `gorm:"column:warehousing_order" json:"warehousing_order" form:"warehousing_order"`
+	WarehouseOutId            int64               `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+	WarehouseOutOrderNumber   string              `gorm:"column:warehouse_out_order_number" json:"warehouse_out_order_number" form:"warehouse_out_order_number"`
+	IsEdit                    int64               `gorm:"column:is_edit" json:"is_edit" form:"is_edit"`
+	CancelStockId             int64               `gorm:"column:cancel_stock_id" json:"cancel_stock_id" form:"cancel_stock_id"`
+	CancelOrderNumber         string              `gorm:"column:cancel_order_number" json:"cancel_order_number" form:"cancel_order_number"`
+	Manufacturer              int64               `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                    int64               `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Creator                   int64               `gorm:"column:creator" json:"creator" form:"creator"`
+	UpdateCreator             int64               `gorm:"column:update_creator" json:"update_creator" form:"update_creator"`
+	Status                    int64               `gorm:"column:status" json:"status" form:"status"`
+	Ctime                     int64               `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                     int64               `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Price                     float64             `gorm:"column:price" json:"price" form:"price"`
+	WarehousingDetailId       int64               `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
+	WarehouseOutDetailId      int64               `gorm:"column:warehouse_out_detail_id" json:"warehouse_out_detail_id" form:"warehouse_out_detail_id"`
+	CancelOutDetailId         int64               `gorm:"column:cancel_out_detail_id" json:"cancel_out_detail_id" form:"cancel_out_detail_id"`
+	ExpireDate                int64               `gorm:"column:expire_date" json:"expire_date" form:"expire_date"`
+	ProductDate               int64               `gorm:"column:product_date" json:"product_date" form:"product_date"`
+	MaxUnit                   string              `gorm:"column:max_unit" json:"max_unit" form:"max_unit"`
+	MinUnit                   string              `gorm:"column:min_unit" json:"min_unit" form:"min_unit"`
+	StockMaxNumber            int64               `gorm:"column:stock_max_number" json:"stock_max_number" form:"stock_max_number"`
+	StockMinNumber            int64               `gorm:"column:stock_min_number" json:"stock_min_number" form:"stock_min_number"`
+	LastStockMaxNumber        int64               `gorm:"column:last_stock_max_number" json:"last_stock_max_number" form:"last_stock_max_number"`
+	LastStockMinNumber        int64               `gorm:"column:last_stock_min_number" json:"last_stock_min_number" form:"last_stock_min_number"`
+	AdviceId                  int64               `gorm:"column:advice_id" json:"advice_id" form:"advice_id"`
+	HisDoctorAdviceInfo       HisDoctorAdviceInfo `gorm:"ForeignKey:ID;AssociationForeignKey:AdviceId" json:"advice"`
+	SupplyWarehouseId         int64               `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_id"`
+	SupplyCancelOutId         int64               `gorm:"column:supply_cancel_out_id" json:"supply_cancel_out_id" form:"supply_cancel_out_id"`
+	SupplyWarehouseDetailInfo int64               `gorm:"column:supply_warehouse_detail_info" json:"supply_warehouse_detail_info" form:"supply_warehouse_detail_info"`
+	StorehouseId              int64               `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	SecondWarehouseInfoId     int64               `gorm:"column:second_warehouse_info_id" json:"second_warehouse_info_id" form:"second_warehouse_info_id"`
+	AdminUserId               int64               `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	LastPrice                 float64             `gorm:"column:last_price" json:"last_price" form:"last_price"`
+	StockCount                string              `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	PharmacyId                int64               `gorm:"column:pharmacy_id" json:"pharmacy_id" form:"pharmacy_id"`
+	IsRead                    int64               `gorm:"column:is_read" json:"is_read" form:"is_read"`
+	IsCheck                   int64               `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	OverCount                 int64               `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	RetailPrice               float64             `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	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"`
+}
+
+func (DrugFlow) TableName() string {
+	return "xt_drug_flow"
+}

service/fj_service.go

@@ -28,7 +28,6 @@ import (
 	"os/exec"
 )
 
-//
 // 人员基本信息
 func FJyb1101(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, id_card_type int64, card_sn string, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, name string, id_card_no string) (string, string, string) {
 	//生成签名
@@ -235,7 +234,7 @@ func FJyb2201(psnNo string, insutype string, certNo string, org_name string, doc
 	return output, requestLog, err_msg
 }
 
-//门诊挂号撤销
+// 门诊挂号撤销
 func FJyb2202(psnNo string, mdtrtId string, ipt_otp_no string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -341,7 +340,7 @@ func FJyb2203(psnNo string, mdtrtId string, doctor string, department string, or
 	return output, requestLog, err_msg
 }
 
-//  门诊费用明细信息上传
+// 门诊费用明细信息上传
 func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescription, chrg_bchno string, org_name string, doctor string, dept string, fixmedins_code string, dept_code string, doctor_id string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, balance_accounts_type string, opter string, url string, app_id string, app_secret string, sign_key string, enc_key string, dise_code string, doctor_number string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -516,7 +515,7 @@ func FJyb2204(psnNo string, mdtrtId string, hisPrescription []*models.HisPrescri
 
 }
 
-//  门诊费用明细信息撤销
+// 门诊费用明细信息撤销
 func FJyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, doctor string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, fixmedins_code string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -551,7 +550,7 @@ func FJyb2205(psnNo string, mdtrtId string, chrgBchno string, org_name string, d
 	return output, requestLog, err_msg
 }
 
-//  门诊预结算
+// 门诊预结算
 func FJyb2206(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, url string, app_id string, app_secret string, sign_key string, enc_key string, acct_used_flag string) (string, string, string) {
 
 	// 生成签名
@@ -701,7 +700,7 @@ func FJyb2206ForToken(psnNo string, mdtrtId string, chrgBchno string, certNo str
 	return output, requestLog, err_msg
 }
 
-//  门诊结算
+// 门诊结算
 func FJyb2207(psnNo string, mdtrtId string, chrgBchno string, certNo string, insutype string, total string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, med_type string, id_card_type int64, fulamt_ownpay_amt float64, overlmt_selfpay float64, preselfpay_amt float64, inscp_scp_amt float64, certificates int64, acct_used_flag string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -851,7 +850,7 @@ func FJyb2207ForToken(psnNo string, mdtrtId string, chrgBchno string, certNo str
 	return output, requestLog, err_msg
 }
 
-//  门诊结算撤销
+// 门诊结算撤销
 func FJyb2208(psnNo string, mdtrtId string, setlId string, org_name string, doctor string, secret_key string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, url string, app_id string, app_secret string, sign_key string, enc_key string) (string, string, string) {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -917,7 +916,7 @@ func FJyb5203(baseParams models.BaseParams, businessParams models.BusinessParams
 	return output, requestLog, err_msg
 }
 
-//确认订单
+// 确认订单
 func FJyb6201(org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, order models.HisOrder, url string, app_id string, app_secret string, sign_key string, enc_key string) string {
 	// 生成签名
 	nonce := GetRandomString(32)
@@ -1006,8 +1005,8 @@ func FJyb6201(org_name string, doctor string, fixmedins_code string, insuplc_adm
 	return str
 }
 
-//  医药机构费用结算对总账 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,acct string) (string, string, string) {
+// 医药机构费用结算对总账 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) {
 
 	fmt.Println(baseParams)
 	fmt.Println(businessParams)
@@ -1041,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"] = acct                   //个人账户支付金额
+	inputData["acct_pay"] = businessParams.AcctPay                    //个人账户支付金额
 	inputData["fixmedins_setl_cnt"] = businessParams.FixmedinsSetlCnt //定点医药机构结算笔数
 	inputData["refd_setl_flag"] = "0"                                 // 就诊 ID（来自2201接口返回）
 
@@ -1063,8 +1062,8 @@ func FJyb3201(baseParams models.BaseParams, businessParams models.BusinessParams
 
 }
 
-//文件上传
-//文件上传
+// 文件上传
+// 文件上传
 func FJyb9101(baseParams models.BaseParams, file_name string, file_byte []byte) string {
 
 	// 生成签名
@@ -1869,7 +1868,6 @@ func Fjyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	inputData["age"] = struct4101.Age                       // 年龄  必填
 	inputData["ntly"] = struct4101.Ntly                     // 国籍  必填
 
-
 	inputData["nwb_age"] = ""                                 // 年龄  必填
 	inputData["naty"] = struct4101.Naty                       // 民族  必填
 	inputData["patn_cert_type"] = struct4101.PatnCertType     // 患者证件类别  必填
@@ -1880,10 +1878,10 @@ func Fjyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	inputData["emp_addr"] = ""                                // 单位地址  必填
 	inputData["emp_tel"] = ""                                 // 单位电话  必填
 	inputData["poscode"] = ""                                 // 邮编  必填
-	inputData["coner_name"] = ""           // 联系人姓名  必填
-	inputData["patn_rlts"] = ""              // 与患者关系  必填
-	inputData["coner_addr"] = ""            // 联系人地址  必填
-	inputData["coner_tel"] = ""              // 联系人电话  必填
+	inputData["coner_name"] = ""                              // 联系人姓名  必填
+	inputData["patn_rlts"] = ""                               // 与患者关系  必填
+	inputData["coner_addr"] = ""                              // 联系人地址  必填
+	inputData["coner_tel"] = ""                               // 联系人电话  必填
 	inputData["hi_type"] = struct4101.HiType                  // 医保类型  必填
 	inputData["insuplc"] = struct4101.Insuplc                 // 参保地  必填
 	inputData["sp_psn_type"] = ""                             // 特殊人员类型  必填
@@ -2019,7 +2017,7 @@ func Fjyb4101(struct4101 Struct4101, params models.PublicParams) (string, string
 	return output, requestLog, err_msg
 }
 
-func Fjyb4102(psn_no string,SetlId string, params models.PublicParams,stas_type string) (string, string, string) {
+func Fjyb4102(psn_no string, SetlId string, params models.PublicParams, stas_type string) (string, string, string) {
 	timestamp := time.Now().Unix()
 	inputMessage := SetHnInputMessage(timestamp, params.FixmedinsName, params.OpterName, params.FixmedinsCode, params.InsuplcAdmdvs, params.MdtrtareaAdmvs, params.Cainfo)
 	// 生成输入报文
@@ -2029,10 +2027,9 @@ func Fjyb4102(psn_no string,SetlId string, params models.PublicParams,stas_type
 	inputData := make(map[string]interface{})
 	inputMessage["infno"] = "4102" // 交易编码
 
-
-	inputData["setl_id"] = SetlId   // 结算 ID  必填
-	inputData["psn_no"] = psn_no     // 结算 ID  必填
-	inputData["stas_type"] = stas_type     // 结算 ID  必填
+	inputData["setl_id"] = SetlId      // 结算 ID  必填
+	inputData["psn_no"] = psn_no       // 结算 ID  必填
+	inputData["stas_type"] = stas_type // 结算 ID  必填
 	input2["stastinfo"] = inputData
 	input["data"] = input2
 	inputMessage["input"] = input //交易输入
@@ -2050,7 +2047,6 @@ func Fjyb4102(psn_no string,SetlId string, params models.PublicParams,stas_type
 	return output, requestLog, err_msg
 }
 
-
 //
 //func Hbyb4101(struct4101 Struct4101, secret_key string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string) string {
 //	// 生成签名
@@ -2428,7 +2424,7 @@ func FJyb2601(psnNo string, omsgid string, oinfno string, org_name string, docto
 	return str
 }
 
-//人员信息版本3
+// 人员信息版本3
 func FJyb1101B(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64) string {
 	//生成签名
 	nonce := GetRandomString(32)
@@ -2510,7 +2506,7 @@ func FJyb1101B(certNo string, org_name string, doctor string, fixmedins_code str
 	return str
 }
 
-//人员信息版本4
+// 人员信息版本4
 func FJyb1101C(certNo string, org_name string, doctor string, fixmedins_code string, insuplc_admdvs string, mdtrtarea_admvs string, secret_key string, id_card_type int64, card_sn string, certificates int64) (string, string) {
 	//生成签名
 	nonce := GetRandomString(32)
@@ -3022,3 +3018,249 @@ func ReadEleCardForSettle(code string, user_name string, id int64) (string, stri
 //	err := readDb.Model(&models.HisPsn{}).Where("patient_id = ? AND insuplc_admdvs <> ''",patient_id).Last(&psn).Error
 //	return
 //}
+
+func FJyb3501(struct3501 models.Struct3501) (string, string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3501.OrgName, struct3501.Opter, struct3501.FixmedinsHilistId, struct3501.InsuplcAdmdvs, struct3501.MdtrtareaAdmvs, struct3501.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	druginputData := make(map[string]interface{})
+	druginputData2 := make(map[string]interface{})
+
+	inputMessage["infno"] = "3501"                                  // 交易编码
+	inputData["med_list_codg"] = struct3501.MedListCodg             // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3501.FixmedinsHilistId // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3501.OrgName         // 定点医药机构目录名称
+	inputData["rx_flag"] = struct3501.RxFlag                        //
+	inputData["invdate"] = struct3501.Invdate                       // 人员编号 （来自1101接口返回）
+	inputData["inv_cnt"] = struct3501.InvCnt                        // 人员编号 （来自1101接口返回）
+	inputData["manu_lotnum"] = struct3501.ManuLotnum                // 人员编号 （来自1101接口返回）
+	inputData["fixmedins_bchno"] = struct3501.FixmedinsBchno        // 人员编号 （来自1101接口返回）
+	inputData["manu_date"] = struct3501.ManuDate                    // 人员编号 （来自1101接口返回）
+	inputData["expy_end"] = struct3501.ExpyEnd                      // 人员编号 （来自1101接口返回）
+	inputData["memo"] = ""                                          // 人员编号 （来自1101接口返回）
+	druginputData["drug_trac_codg"] = ""
+	druginputData2["drugtracinfo"] = druginputData
+	inputData["drug_trac_info"] = druginputData2
+	input["invinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+	bytesData, err := json.Marshal(inputMessage)
+	var requestLog string
+	//bytesData, err := json.Marshal(inputMessage)
+	requestLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		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
+}
+func FJyb3502(struct3502 models.Struct3502) (string, string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3502.OrgName, struct3502.Opter, struct3502.FixmedinsCode, struct3502.InsuplcAdmdvs, struct3502.MdtrtareaAdmvs, struct3502.Cainfo)
+	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
+
+	input["invinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	var requestLog string
+	//bytesData, err := json.Marshal(inputMessage)
+	requestLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		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
+
+}
+func FJyb3505(struct3505 models.Struct3505) (string, string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3505.OrgName, struct3505.Opter, struct3505.FixmedinsHilistId, struct3505.InsuplcAdmdvs, struct3505.MdtrtareaAdmvs, struct3505.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	druginputData := make(map[string]interface{})
+	druginputData2 := make(map[string]interface{})
+
+	inputMessage["infno"] = "3505"                                  // 交易编码
+	inputData["med_list_codg"] = struct3505.MedListCodg             // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3505.FixmedinsHilistId // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3505.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3505.FixmedinsBchno        // 人员编号 （来自1101接口返回）
+
+	inputData["prsc_dr_cert_type"] = struct3505.PrscDrCertType // 人员编号 （来自1101接口返回）
+	inputData["prsc_dr_certno"] = struct3505.PrscDrCertno      // 人员编号 （来自1101接口返回）
+	inputData["prsc_dr_name"] = struct3505.PrscDrName          // 人员编号 （来自1101接口返回）
+	inputData["phar_cert_type"] = struct3505.PharCertType      // 人员编号 （来自1101接口返回）
+	inputData["phar_certno"] = struct3505.PharCertno           // 人员编号 （来自1101接口返回）
+
+	inputData["phar_name"] = struct3505.PharName               // 人员编号 （来自1101接口返回）
+	inputData["phar_prac_cert_no"] = struct3505.PharPracCertNo // 人员编号 （来自1101接口返回）
+	//inputData["hi_feesetl_type"] = struct3505.HiFeesetlType    // 人员编号 （来自1101接口返回）
+	inputData["setl_id"] = struct3505.SetlId            // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_sn"] = struct3505.MdtrtSn          // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = struct3505.PsnNo              // 人员编号 （来自1101接口返回）
+	inputData["psn_cert_type"] = struct3505.PsnCertType // 人员编号 （来自1101接口返回）
+	inputData["certno"] = struct3505.CertNo             // 人员编号 （来自1101接口返回）
+	inputData["psn_name"] = struct3505.PsnName          // 人员编号 （来自1101接口返回）
+	inputData["manu_lotnum"] = struct3505.ManuLotnum    // 人员编号 （来自1101接口返回）
+	inputData["manu_date"] = struct3505.ManuDate        // 人员编号 （来自1101接口返回）
+	inputData["expy_end"] = struct3505.ExpyEnd          // 人员编号 （来自1101接口返回）
+
+	inputData["rx_flag"] = struct3505.RxFlag     // 人员编号 （来自1101接口返回）
+	inputData["trdn_flag"] = struct3505.TrdnFlag // 人员编号 （来自1101接口返回）
+
+	inputData["finl_trns_pric"] = struct3505.FinlTrnsPric // 人员编号 （来自1101接口返回）
+	inputData["rxno"] = struct3505.Rxno                   // 人员编号 （来自1101接口返回）
+	inputData["rx_circ_flag"] = struct3505.RxCircFlag     // 人员编号 （来自1101接口返回）
+
+	inputData["rtal_docno"] = struct3505.RtalDocno // 人员编号 （来自1101接口返回）
+	inputData["stoout_no"] = struct3505.StooutNo   // 人员编号 （来自1101接口返回）
+
+	inputData["bchno"] = struct3505.Bchno // 人员编号 （来自1101接口返回）
+	//inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自1101接口返回）
+	inputData["drug_prod_barc"] = struct3505.DrugProdBarc          // 人员编号 （来自1101接口返回）
+	inputData["shelf_posi"] = struct3505.ShelfPosi                 // 人员编号 （来自1101接口返回）
+	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
+
+	input["selinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	var requestLog string
+	//bytesData, err := json.Marshal(inputMessage)
+	requestLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		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
+
+}
+func FJyb3506(struct3506 models.Struct3506) (string, string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3506.OrgName, struct3506.Opter, struct3506.FixmedinsCode, struct3506.InsuplcAdmdvs, struct3506.MdtrtareaAdmvs, struct3506.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	druginputData := make(map[string]interface{})
+	druginputData2 := make(map[string]interface{})
+
+	inputMessage["infno"] = "3506"                                  // 交易编码
+	inputData["med_list_codg"] = struct3506.MedListCodg             // 定点医药机构目录编号
+	inputData["fixmedins_hilist_id"] = struct3506.FixmedinsHilistId // 定点医药机构目录编号
+	inputData["fixmedins_hilist_name"] = struct3506.OrgName         // 定点医药机构目录名称
+	inputData["fixmedins_bchno"] = struct3506.FixmedinsBchno        // 人员编号 （来自1101接口返回）
+
+	inputData["setl_id"] = struct3506.SetlId                       // 人员编号 （来自1101接口返回）
+	inputData["psn_no"] = struct3506.PsnNo                         // 人员编号 （来自1101接口返回）
+	inputData["psn_cert_type"] = struct3506.PsnCertType            // 人员编号 （来自1101接口返回）
+	inputData["certno"] = struct3506.Certno                        // 人员编号 （来自1101接口返回）
+	inputData["psn_name"] = struct3506.PsnName                     // 人员编号 （来自1101接口返回）
+	inputData["manu_lotnum"] = struct3506.ManuLotnum               // 人员编号 （来自1101接口返回）
+	inputData["manu_date"] = struct3506.ManuDate                   // 人员编号 （来自1101接口返回）
+	inputData["expy_end"] = struct3506.ExpyEnd                     // 人员编号 （来自1101接口返回）
+	inputData["rx_flag"] = struct3506.RxFlag                       // 人员编号 （来自1101接口返回）
+	inputData["trdn_flag"] = struct3506.TrdnFlag                   // 人员编号 （来自1101接口返回）
+	inputData["finl_trns_pric"] = struct3506.FinlTrnsPric          // 人员编号 （来自1101接口返回）
+	inputData["sel_retn_cnt"] = struct3506.SelRetnCnt              // 人员编号 （来自1101接口返回）
+	inputData["sel_retn_time"] = struct3506.SelRetnTime            // 人员编号 （来自1101接口返回）
+	inputData["sel_retn_opter_name"] = struct3506.SelRetnOpterName // 人员编号 （来自1101接口返回）
+	inputData["memo"] = ""                                         // 人员编号 （来自1101接口返回）
+	inputData["medins_prod_sel_no"] = ""                           // 人员编号 （来自1101接口返回）
+	inputData["mdtrt_sn"] = ""                                     // 人员编号 （来自1101接口返回）
+
+	druginputData["drug_trac_codg"] = ""
+	druginputData2["drugtracinfo"] = druginputData
+	inputData["drug_trac_info"] = druginputData2
+
+	input["selinfo"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	var requestLog string
+	//bytesData, err := json.Marshal(inputMessage)
+	requestLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		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
+
+}
+func FJyb3507(struct3507 models.Struct3507) (string, string, string) {
+	timestamp := time.Now().Unix()
+	// 生成输入报文
+	inputMessage := SetJSInputMessage(timestamp, struct3507.OrgName, struct3507.Opter, struct3507.FixmedinsCode, struct3507.InsuplcAdmdvs, struct3507.MdtrtareaAdmvs, struct3507.Cainfo)
+	input := make(map[string]interface{})
+	inputData := make(map[string]interface{})
+	inputMessage["infno"] = "3507"                          // 交易编码
+	inputData["fixmedins_bchno"] = struct3507.FixmedinsCode // 人员编号 （来自1101接口返回）
+	inputData["inv_data_type"] = struct3507.InvDataType     // 人员编号 （来自1101接口返回）
+
+	input["data"] = inputData
+	inputMessage["input"] = input //交易输入
+
+	bytesData, err := json.Marshal(inputMessage)
+	var requestLog string
+	//bytesData, err := json.Marshal(inputMessage)
+	requestLog = string(bytesData)
+	fmt.Println(string(bytesData))
+	if err != nil {
+		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
+
+}

service/his_service.go

@@ -1702,3 +1702,25 @@ func GetAllHisOrderTwo10485() (his []*models.HisOrder, err error) {
 	fmt.Println(err)
 	return
 }
+
+func GetNewDrugWarehouseInfo(id_arr []string) (newDrugWarehouse []*models.NewDrugWarehouseInfo, err error) {
+	readDb.Model(&models.NewDrugWarehouseInfo{}).Where("org_id = ? and status = 1 and id in (?) ", 10191, id_arr).Preload("BaseDrugLib", "status = 1").Preload("Manufacturers", "status = 1 AND org_id = ?", 10191).Preload("Dealers", "status = 1 AND org_id = ?", 10191).Find(&newDrugWarehouse)
+	return
+}
+
+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")
+	}).Find(&flows).Error
+	return
+}
+
+func GetHisPrescriptionByID(id int64) (pre models.HisPrescription) {
+	err = readDb.Model(&models.HisPrescription{}).Where("id = ? and status = 1", id).Find(&pre).Error
+	return
+}
+
+func GetHisOrderByNumber(number string) (order models.HisOrder) {
+	err = readDb.Model(&models.HisOrder{}).Where("number = ? and status = 1", number).First(&order).Error
+	return
+}