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

controllers/sg/his_api_controller.go

@@ -3176,6 +3176,175 @@ func GetNowTime() (int64, int64) {
 //		})
 //	}
 //}
+func (c *HisApiController) ChangeDrugfour() {
+	patient_id, _ := c.GetInt64("patient_id")
+	admin_user_id, _ := c.GetInt64("admin_user_id")
+	//id_arr := strings.Split(ids, ",")
+	times := c.GetString("time", "")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var stime, etime int64
+	if times == "" {
+		stime, etime = GetNowTime()
+	} else {
+		stmp, _ := time.ParseInLocation(timeLayout+" 15:04:05", times+" 00:00:00", loc)
+		stime = stmp.Unix()
+		etime = stime + 86399
+	}
+	advicelist, _ := service.FindeHisAdviceDocAdvice(c.GetAdminUserInfo().CurrentOrgId, patient_id, stime, etime)
+	var flows []*models.DrugFlow
+	for _, item := range advicelist {
+		flow, _ := service.GetNewDrugFlowInfoByPatient(patient_id, item.DrugId, times, c.GetAdminUserInfo().CurrentOrgId)
+		flows = append(flows, flow...)
+	}
+	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
+	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)
+	var err []string
+
+	for _, item := range flows {
+		var res3 ResultSix
+		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 { //没变更，进行变更操作
+						bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+
+						result, result2 := ChangeStock(item.Count, item, miConfig, "102", roles, bg_number)
+						saveLog(result, result2, "3502", "自动出库，已经销售，未变更3502")
+						var respJSON3 map[string]interface{}
+						if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+							utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						userJSONBytes3, _ := json.Marshal(respJSON3)
+						if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						if res3.Infcode == 0 {
+							item.IsChange = 1
+							item.BgBchno = bg_number
+							service.SaveDF2(item)
+						} else {
+
+							err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
+						}
+					}
+				} else { //没销售，
+					var res FJ3507Result
+					var res3507for10188 FJ3507ResultFor10188
+					number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3505"
+
+					//进行商品销售接口
+					result3, result4 := SaleStock(c.GetAdminUserInfo().CurrentOrgId, prescription, item, miConfig, "", roles, number)
+					saveLog(result3, result4, "3505", "自动出库，未销售进行销售行为，3505")
+					var respJSON3 map[string]interface{}
+					if err := json.Unmarshal([]byte(string(result3)), &respJSON3); err != nil {
+						utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+						return
+					}
+					userJSONBytes3, _ := json.Marshal(respJSON3)
+					if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
+						if err := json.Unmarshal(userJSONBytes3, &res3507for10188); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+						//if res3507for10188.Infcode
+						res.InfRefmsgid = res3507for10188.InfRefmsgid
+						//res.Output = resSix10265.Output
+						res.ErrMsg = res3507for10188.ErrMsg
+						res.Cainfo = res3507for10188.Cainfo
+						res.WarnMsg = res3507for10188.WarnMsg
+						infocode, _ := strconv.ParseInt(res3507for10188.Infcode, 10, 64)
+						res.Infcode = infocode
+					} else {
+						if err := json.Unmarshal(userJSONBytes3, &res); err != nil {
+							utils.ErrorLog("解析失败：%v", err)
+							c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+							return
+						}
+
+					}
+					if res.Infcode == 0 {
+						item.IsSale = 1
+						item.Bchno = number
+						item.SaleDate = time.Now().Format("2006-01-02")
+
+						err5 := service.SaveDF(item)
+						if err5 == nil {
+							if item.IsChange == 0 { //没变更，进行变更操作
+								bg_number := strconv.FormatInt(time.Now().Unix(), 10) + "-" + strconv.FormatInt(item.ID, 10) + "-" + "3502"
+
+								result, result2 := ChangeStock(item.Count, item, miConfig, "102", roles, bg_number)
+								saveLog(result, result2, "3502", "自动出库，没销售，未变更3502")
+
+								var respJSON3 map[string]interface{}
+								if err := json.Unmarshal([]byte(string(result)), &respJSON3); err != nil {
+									utils.ErrorLog("接口返回数据解析JSON失败: %v", err)
+									c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+									return
+								}
+								if c.GetAdminUserInfo().CurrentOrgId == 10188 || c.GetAdminUserInfo().CurrentOrgId == 10217 {
+									if err := json.Unmarshal(userJSONBytes3, &res3507for10188); err != nil {
+										utils.ErrorLog("解析失败：%v", err)
+										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+										return
+									}
+									//if res3507for10188.Infcode
+									res3.InfRefmsgid = res3507for10188.InfRefmsgid
+									//res.Output = resSix10265.Output
+									res3.ErrMsg = res3507for10188.ErrMsg
+									res3.Cainfo = res3507for10188.Cainfo
+									res3.WarnMsg = res3507for10188.WarnMsg
+									infocode, _ := strconv.ParseInt(res3507for10188.Infcode, 10, 64)
+									res3.Infcode = infocode
+								} else {
+									if err := json.Unmarshal(userJSONBytes3, &res3); err != nil {
+										utils.ErrorLog("解析失败：%v", err)
+										c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+										return
+									}
+								}
+								if res3.Infcode == 0 {
+									item.IsChange = 1
+									item.BgBchno = bg_number
+									service.SaveDF2(item)
+								} else {
+
+									err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售变更失败："+res3.ErrMsg)
+								}
+							}
+						}
+					} else {
+
+						err = append(err, item.HisDoctorAdviceInfo.AdviceName+",销售失败："+res.ErrMsg)
+					}
+				}
+
+			} else { //还没结，提示用户去结算，并药品追溯上传
+				err = append(err, item.HisDoctorAdviceInfo.AdviceName+"还没结算，请结算后，在药品追溯页面上传")
+			}
+		}
+	}
+	if len(err) == 0 {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "销售变更成功",
+		})
+	} else {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"failed_code": -10,
+			"msg":         err,
+		})
+	}
+}
 
 func (c *HisApiController) ChangeDrug() {
 	ids := c.GetString("ids")
@@ -4445,7 +4614,9 @@ func (c *HisApiController) ChangeDrugTen() {
 
 	//ids := c.GetString("ids")
 	//id_arr := strings.Split(ids, ",")
-	flows, _ := service.GetNewDrugFlowInforTen()
+	now := time.Now()
+	timestamp := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local).Unix()
+	flows, _ := service.GetNewDrugFlowInforTen(timestamp)
 	admin_user_id, _ := c.GetInt64("admin_user_id")
 	roles, _ := service.GetAdminUserInfoByID(c.GetAdminUserInfo().CurrentOrgId, admin_user_id)
 	miConfig, _ := service.FindMedicalInsuranceInfo(c.GetAdminUserInfo().CurrentOrgId)

models/new_stock_models.go

@@ -261,13 +261,12 @@ type NewDrugWarehouseInfo struct {
 	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"`
-	Bchno   string `gorm:"column:bchno" json:"bchno" form:"bchno"`
-	PcDate  int64 `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
-	BgBchno string `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
+	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"`
+	PcDate   int64  `gorm:"column:pc_date" json:"pc_date" form:"pc_date"`
+	BgBchno  string `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
 	DrugCode string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-
 }
 
 func (NewDrugWarehouseInfo) TableName() string {
@@ -424,7 +423,7 @@ type DrugFlow struct {
 	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"`
+	HisDoctorAdviceInfo       HisDoctorAdviceInfo  `gorm:"ForeignKey:PatientID,RecordDate;AssociationForeignKey,DrugId:PatientID,SystemTime,DrugId" 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"`
@@ -445,9 +444,7 @@ type DrugFlow struct {
 	Bchno                     string               `gorm:"column:bchno" json:"bchno" form:"bchno"`
 	SaleDate                  string               `gorm:"column:sale_date" json:"sale_date" form:"sale_date"`
 	BgBchno                   string               `gorm:"column:bg_bchno" json:"bg_bchno" form:"bg_bchno"`
-	DrugCode 	string `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
-
-
+	DrugCode                  string               `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
 }
 
 func (DrugFlow) TableName() string {

service/his_service.go

@@ -1739,8 +1739,8 @@ func GetNewDrugFlowInfo(org_id int64, id_arr []string) (flows []*models.DrugFlow
 	return
 }
 
-func GetNewDrugFlowInfoByPatient(patient_id int64, advice_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?) and patinet_id = ? and advice_id = ? and system_time = ?", org_id, patient_id, advice_id, time).Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+func GetNewDrugFlowInfoByPatient(patient_id int64, advdrug_idice_id int64, time int64, org_id int64) (flows []*models.DrugFlow, err error) {
+	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = ? and status = 1 and id in (?) and patinet_id = ? and drug_id = ? and system_time = ?", org_id, patient_id, drug_id, time).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
@@ -1767,8 +1767,8 @@ func GetNewDrugFlowInfothree() (flows []*models.DrugFlow, err error) {
 	return
 }
 
-func GetNewDrugFlowInforTen() (flows []*models.DrugFlow, err error) {
-	err = readDb.Model(&models.DrugFlow{}).Where("user_org_id = 10318 and status = 1 and drug_code != '' and consumable_type = 3 and is_sale = 0").Preload("HisDoctorAdviceInfo", func(db *gorm.DB) *gorm.DB {
+func GetNewDrugFlowInforTen(system_time 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("user_org_id = 10318 and status = 1 and consumable_type = 3 and is_sale = 0 and system_time = ?", system_time).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