Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10744 //机构id
+		subscibe.OrgId = 9478 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10744 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 9478  //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18723 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10744 //机构id小英9675或4
+		subscibe.OrgId = 9478 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10744 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 9478  //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 18723 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/dialysis_api_controller.go

@@ -3129,6 +3129,10 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				newprescribe.Amylaceum = dialysisSolution.Amylaceum
 				newprescribe.Status = 1
 
+				if adminUserInfo.CurrentOrgId == 10677 {
+					newprescribe.Remark = ""
+				}
+
 				if adminUserInfo.CurrentOrgId == 10579 {
 					newprescribe.Modifier = 0
 					newprescribe.PrescriptionDoctor = 0
@@ -3216,6 +3220,9 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 						newprescribe.PrescriptionDoctor = 0
 						newprescribe.Creater = 0
 					}
+					if adminUserInfo.CurrentOrgId == 10677 {
+						newprescribe.Remark = ""
+					}
 					err := service.AddSigleRecord(&newprescribe)
 					//记录日志
 					byterequest, _ := json.Marshal(newprescribe)

controllers/his_config_api_controller.go

@@ -918,6 +918,7 @@ func (c *HisConfigApiController) DeleteModeProjectTemplate() {
 }
 
 func (c *HisConfigApiController) DeleteModeAdviceTemplate() {
+
 	id, _ := c.GetInt64("id")
 	err := service.DelelteHisModePrescriptionAdviceTemplate(id, c.GetAdminUserInfo().CurrentOrgId)
 	if err == nil {

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -439,7 +439,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			newprescribe.BloodAccessPartId = dialysisSolution.BloodAccessPartId
 			newprescribe.Amylaceum = dialysisSolution.Amylaceum
 			newprescribe.Status = 1
-			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 && adminUserInfo.Org.Id != 10016 {
+			if adminUserInfo.Org.Id != 10013 && adminUserInfo.Org.Id != 10014 && adminUserInfo.Org.Id != 10016 && adminUserInfo.Org.Id != 10677 {
 				newprescribe.Remark = dialysisSolution.Remark
 			}
 
@@ -469,7 +469,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			}
 
 			//恒泰
-			if adminUserInfo.Org.Id == 10490 || adminUserInfo.Org.Id == 10016 {
+			if adminUserInfo.Org.Id == 10490 || adminUserInfo.Org.Id == 10016 || adminUserInfo.Org.Id == 10677 {
 				newprescribe.Remark = ""
 			}
 
@@ -601,7 +601,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				//} else {
 				//	newprescribe.Remark = ""
 				//}
-				if adminUserInfo.Org.Id == 10490 || adminUserInfo.Org.Id == 10016 {
+				if adminUserInfo.Org.Id == 10490 || adminUserInfo.Org.Id == 10016 || adminUserInfo.Org.Id == 10677 {
 					newprescribe.Remark = ""
 				}
 
@@ -940,7 +940,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				}
 
 				evaluation.Remark = lastPredialysisEvaluation.Remark
-				if adminUserInfo.Org.Id == 10318 || adminUserInfo.Org.Id == 10490 || adminUserInfo.Org.Id == 10016 {
+				if adminUserInfo.Org.Id == 10318 || adminUserInfo.Org.Id == 10490 || adminUserInfo.Org.Id == 10016 || adminUserInfo.Org.Id == 10677 {
 					evaluation.Remark = ""
 				}
 				if adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10447 {
@@ -1149,7 +1149,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				afterevaluation.ActualDisplacement = DisplacementQuantityOne
 			}
 		}
-		if adminUserInfo.Org.Id == 10721 {
+		if adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 9478 {
 			afterevaluation.Temperature = 36.5
 		}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3996,6 +3996,11 @@ func (this *DialysisAPIController) StartDialysis() {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescription)
 			return
 		}
+		advices, _ := service.GetDialysisPrescriptionDoctorAdviceList(adminUserInfo.Org.Id, patientID, schedulestartTime)
+		if len(advices) == 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePrescription)
+			return
+		}
 	}
 
 	//查询该床位是否有人用了

controllers/mobile_api_controllers/patient_api_controller.go

@@ -4002,6 +4002,10 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 				newprescribe.Creater = 0
 				newprescribe.PrescriptionDoctor = 0
 			}
+
+			if adminUserInfo.Org.Id == 10677 {
+				newprescribe.Remark = ""
+			}
 			err := service.AddSigleRecord(&newprescribe)
 			//记录日志
 			byterequest, _ := json.Marshal(newprescribe)
@@ -4171,6 +4175,9 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					newprescribe.Creater = 0
 					newprescribe.PrescriptionDoctor = 0
 				}
+				if adminUserInfo.Org.Id == 10677 {
+					newprescribe.Remark = ""
+				}
 				err := service.AddSigleRecord(&newprescribe)
 
 				//记录日志
@@ -4339,6 +4346,9 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 					newprescribe.Creater = 0
 					newprescribe.PrescriptionDoctor = 0
 				}
+				if adminUserInfo.Org.Id == 10677 {
+					newprescribe.Remark = ""
+				}
 				err := service.AddSigleRecord(&newprescribe)
 				//记录日志
 				byterequest, _ := json.Marshal(newprescribe)

controllers/self_drug_api_congtroller.go

@@ -199,6 +199,8 @@ func SelfDrugRouters() {
 
 	beego.Router("/api/drug/getdrugpurchasequerylist", &SelfDrugApiController{}, "Get:GetDrugPurchaseQueryList")
 
+	beego.Router("/api/patient/getgoodwarehouseinprintlist", &SelfDrugApiController{}, "Get:GetGoodWarehosueInfoPrintList")
+
 }
 
 func (this *SelfDrugApiController) GetCurrentPatient() {
@@ -6805,3 +6807,52 @@ func (this *SelfDrugApiController) GetDrugPurchaseQueryList() {
 		"dealerList":       dealerList,
 	})
 }
+
+func (this *SelfDrugApiController) GetGoodWarehosueInfoPrintList() {
+
+	good_id, _ := this.GetInt64("good_id")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	var startTime int64
+
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 23:59:59", loc)
+		if err != nil {
+			utils.ErrorLog(err.Error())
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	list, _ := service.GetGoodWarehosueInfoPrintList(good_id, startTime, endTime, orgId)
+	manufacturerList, _ := service.GetAllManufacturerList(orgId)
+	dealerList, _ := service.GetAllDealerList(orgId)
+	goodList, _ := service.GetMobileGoodList(orgId)
+	goodsType, _ := service.GetAllGoodType(orgId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":             list,
+		"manufacturerList": manufacturerList,
+		"dealerList":       dealerList,
+		"goodList":         goodList,
+		"goodsType":        goodsType,
+	})
+}

controllers/stock_in_api_controller.go

@@ -8166,7 +8166,7 @@ func (this *StockManagerApiController) UpdateBaseDrugListByUserOrgID() {
 	//	service.UpdateDealerManufacturerOne(item.ID, manufacturer.ManufacturerName)
 	//}
 
-	drugList, _ := service.GetAllBaseDrugListTwentyOne(10480)
+	drugList, _ := service.GetAllBaseDrugListTwentyOne(10726)
 
 	for _, item := range drugList {
 		var drug_spec = item.Dose + item.DoseUnit + "*" + strconv.FormatInt(item.MinNumber, 10) + item.MinUnit + "/" + item.MaxUnit

enums/error_code.go

@@ -557,7 +557,7 @@ var ErrCodeMsgs = map[int]string{
 	ErrorTimeCodeParamWrong: "时间跨度不能超过一个月",
 	ErrorCodeAuthWrong:      "尚未实名认证,请先认证",
 	ErrorCodeFlow:           "网络错误,数据异常,审核失败",
-	ErrorCodePrescription:   "请先开处方",
+	ErrorCodePrescription:   "请先开处方或医嘱",
 }
 
 type SGJError struct {

models/stock_models.go

@@ -1865,3 +1865,41 @@ type XtDrugCodeOpen struct {
 func (XtDrugCodeOpen) TableName() string {
 	return "xt_drug_code_open"
 }
+
+type PrintWarehousingInfo struct {
+	ID                        int64   `gorm:"column:id" json:"id"`
+	WarehousingId             int64   `gorm:"column:warehousing_id" json:"warehousing_id"`
+	GoodId                    int64   `gorm:"column:good_id" json:"good_id"`
+	GoodTypeId                int64   `gorm:"column:good_type_id" json:"good_type_id"`
+	Number                    string  `gorm:"column:number" json:"number"`
+	ProductDate               int64   `gorm:"column:product_date" json:"product_date"`
+	ExpiryDate                int64   `gorm:"column:expiry_date" json:"expiry_date"`
+	WarehousingCount          int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit           string  `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	Price                     float64 `gorm:"column:price" json:"price"`
+	TotalPrice                float64 `gorm:"column:total_price" json:"total_price"`
+	Dealer                    int64   `gorm:"column:dealer" json:"dealer"`
+	Manufacturer              int64   `gorm:"column:manufacturer" json:"manufacturer"`
+	Remark                    string  `gorm:"column:remark" json:"remark"`
+	Ctime                     int64   `gorm:"column:ctime" json:"ctime"`
+	Mtime                     int64   `gorm:"column:mtime" json:"mtime"`
+	Status                    int64   `gorm:"column:status" json:"status"`
+	OrgId                     int64   `gorm:"column:org_id" json:"org_id"`
+	IsReturn                  int64   `gorm:"column:is_return" json:"is_return"`
+	StockCount                int64   `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
+	WarehousingOrder          string  `gorm:"column:warehousing_order" json:"warehousing_order"`
+	Type                      int64   `gorm:"column:type" json:"type"`
+	LicenseNumber             string  `gorm:"column:license_number" json:"license_number" form:"license_number"`
+	WarehouseInfoId           int64   `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	PackingPrice              float64 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	SupplyWarehouseId         int64   `gorm:"column:supply_warehouse_id" json:"supply_warehouse_id" form:"supply_warehouse_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"`
+	RegisterNumber            string  `gorm:"column:register_number" json:"register_number" form:"register_number"`
+	GoodCode                  string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
+}
+
+func (PrintWarehousingInfo) TableName() string {
+	return "xt_warehouse_info"
+}

service/schedule_service.go

@@ -244,6 +244,13 @@ func GetDialysisPrescriptionByRecord(orgID int64, patient_id int64, record_date
 	return prescription, err
 }
 
+func GetDialysisPrescriptionDoctorAdviceList(orgID int64, patient_id int64, record_date int64) (advices []*models.DoctorAdvices, err error) {
+
+	err = readDb.Where("user_org_id = ? and patient_id = ? and advice_date = ? and status=1", orgID, patient_id, record_date).Find(&advices).Error
+
+	return advices, err
+}
+
 func GetDayScheduleByOrder(orgID, start, bed_id int64, schedule_type int64) (schedule models.DialysisOrder, err error) {
 	err = readDb.Model(&models.DialysisOrder{}).Where("user_org_id=?  and dialysis_date=? and bed_id=? and status=1 AND schedual_type = ?", orgID, start, bed_id, schedule_type).First(&schedule).Error
 	return

service/stock_service.go

@@ -11232,3 +11232,26 @@ func GetPatientAdviceListDetail(patient_id int64, start_time int64, end_time int
 
 	return advice, err
 }
+
+func GetGoodWarehosueInfoPrintList(good_id int64, start_time int64, end_time int64, user_org_id int64) (info []*models.PrintWarehousingInfo, err error) {
+
+	db := XTReadDB().Model(&info).Where("status=1")
+
+	if good_id > 0 {
+		db = db.Where("good_id = ?", good_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+	if user_org_id > 0 {
+		db = db.Where("org_id = ?", user_org_id)
+	}
+
+	err = db.Find(&info).Error
+
+	return info, err
+}