更新

controllers/sg/his_api_controller.go

@@ -38,6 +38,8 @@ import (
 	"syscall"
 	"time"
 	"unsafe"
+	"github.com/go-ole/go-ole"
+
 )
 
 type HisApiController struct {
@@ -4613,8 +4615,8 @@ func (c *HisApiController) ChangeDrugTen() {
 
 	//ids := c.GetString("ids")
 	//id_arr := strings.Split(ids, ",")
-	now := time.Now()
-	timestamp := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).Unix()
+	//now := time.Now()
+	timestamp := 1729526400
 	flows, _ := service.GetNewDrugFlowInforTen(timestamp, c.GetAdminUserInfo().CurrentOrgId)
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
@@ -4763,6 +4765,7 @@ func (c *HisApiController) ChangeDrugTen() {
 									item.IsChange = 1
 									item.BgBchno = bg_number
 									service.SaveDF2(item)
+									return
 								} else {
 									err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
 								}

service/gdyb_service.go

@@ -8747,21 +8747,23 @@ func Gzyb3505(struct3505 models.Struct3505, secret_key string) (string, string)
 	inputData["MDTRT_SETL_TYPE"] = struct3505.MdtrtSetlType // 人员编号 （来自1101接口返回）
 
 	inputData["bchno"] = struct3505.Bchno // 人员编号 （来自1101接口返回）
-	//inputData["drug_trac_codg"] = struct3505.DrugTracCodg          // 人员编号 （来自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接口返回）
-
+	//drug_trac_cod .g
 	feedetail := make([]map[string]interface{}, 0)
 
 	codes := strings.Split(struct3505.DrugTracCodg, ",")
 	for _, item := range codes {
-		druginputData := make(map[string]interface{})
-		druginputData["drug_trac_codg"] = item
-		feedetail = append(feedetail, druginputData)
+		if len(item) > 0{
+			druginputData := make(map[string]interface{})
+			druginputData["drug_trac_codg"] = item
+			feedetail = append(feedetail, druginputData)
+		}
 	}
 	inputData["drugtracinfo"] = feedetail
 	input["selinfo"] = inputData

service/his_service.go

@@ -1770,7 +1770,7 @@ func GetNewDrugFlowInfothree() (flows []*models.DrugFlow, err error) {
 	return
 }
 
-func GetNewDrugFlowInforTen(system_time int64,org_id int64) (flows []*models.DrugFlow, err error) {
+func GetNewDrugFlowInforTen(system_time int,org_id int64) (flows []*models.DrugFlow, err error) {
 	err = readDb.Model(&models.DrugFlow{}).Joins("join his_doctor_advice_info info on info.patient_id = xt_drug_flow.patient_id and info.drug_id = xt_drug_flow.drug_id and info.record_date = xt_drug_flow.system_time").Where("xt_drug_flow.user_org_id = ? and xt_drug_flow.status = 1 and xt_drug_flow.consumable_type = 3 and xt_drug_flow.is_sale = 0 and xt_drug_flow.system_time = ?", org_id,system_time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
 		return db.Where("status = 1 and drug_code <> ''").Preload("BaseDrugLib", "status=1")
 	}).Preload("NewDrugWarehouseInfo", "status = 1").Find(&flows).Error