2024/6/17

controllers/patient_dataconfig_api_controller.go

@@ -1,10 +1,6 @@
 package controllers
 
 import (
-	"XT_New/enums"
-	"XT_New/models"
-	"XT_New/service"
-	"XT_New/utils"
 	"encoding/json"
 	"fmt"
 	"reflect"
@@ -12,6 +8,11 @@ import (
 	"strings"
 	"time"
 
+	"XT_New/enums"
+	"XT_New/models"
+	"XT_New/service"
+	"XT_New/utils"
+
 	"github.com/astaxie/beego"
 )
 
@@ -1049,15 +1050,15 @@ func (this *PatientDataConfigAPIController) ModifyCourse() {
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 
 	adminUserInfo := this.GetAdminUserInfo()
-	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
-	if getPatientErr != nil {
-		this.ErrorLog("获取患者信息失败:%v", getPatientErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if patient == nil {
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
-		return
-	}
+	//patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
+	//if getPatientErr != nil {
+	//	this.ErrorLog("获取患者信息失败:%v", getPatientErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if patient == nil {
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodePatientNoExist)
+	//	return
+	//}
 
 	now := time.Now().Unix()
 

models/new_stock_models.go

@@ -265,28 +265,28 @@ func (VmNewStockFlowTwenty) TableName() string {
 }
 
 type GoodInfoTwenty struct {
-	ID                int64                `gorm:"column:id" json:"id" form:"id"`
-	SpecificationName string               `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
-	GoodTypeId        int64                `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
-	BuyPrice          float64              `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	Manufacturer      int64                `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer            int64                `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	Status            int64                `gorm:"column:status" json:"status" form:"status"`
-	OrgId             int64                `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	GoodName          string               `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	RetailPrice       float64              `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	PackingUnit       string               `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
-	PackingPrice      float64              `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
-	GoodNumber        string               `gorm:"column:good_number" json:"good_number" form:"good_number"`
-	StWarehousingInfo []*StWarehousingInfo `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
-
-	WarehousingInfoOne     []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
-	WarehousingInfoStart   []*StartWarehousingInfo `gorm:"json:"warehouse_info_start"`
-	WarehousingInfoEnd     []*StartWarehousingInfo `gorm:"json:"warehouse_info_end"`
-	WarehouseOutInfoEnd    []*VmStockFlowTwenty
-	WarehouseOutInfoStart  []*VmStockFlowTwenty
-	WarehouseInfoEnd       []*VmStockFlowTwenty //期末入库量
-	StartFlowWarehouseInfo []*VmStockFlowTwenty //本期增加
+	ID                          int64                   `gorm:"column:id" json:"id" form:"id"`
+	SpecificationName           string                  `gorm:"column:specification_name" json:"specification_name" form:"specification_name"`
+	GoodTypeId                  int64                   `gorm:"column:good_type_id" json:"good_type_id" form:"good_type_id"`
+	BuyPrice                    float64                 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	Manufacturer                int64                   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                      int64                   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	Status                      int64                   `gorm:"column:status" json:"status" form:"status"`
+	OrgId                       int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	GoodName                    string                  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	RetailPrice                 float64                 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	PackingUnit                 string                  `gorm:"column:packing_unit" json:"packing_unit" form:"packing_unit"`
+	PackingPrice                float64                 `gorm:"column:packing_price" json:"packing_price" form:"packing_price"`
+	GoodNumber                  string                  `gorm:"column:good_number" json:"good_number" form:"good_number"`
+	SocialSecurityDirectoryCode string                  `gorm:"column:social_security_directory_code" json:"social_security_directory_code" form:"social_security_directory_code"`
+	StWarehousingInfo           []*StWarehousingInfo    `gorm:"ForeignKey:GoodId;AssociationForeignKey:ID" json:"xt_warehouse_info"`
+	WarehousingInfoOne          []*StartWarehousingInfo `gorm:"json:"warehouse_info"` //期间增加
+	WarehousingInfoStart        []*StartWarehousingInfo `gorm:"json:"warehouse_info_start"`
+	WarehousingInfoEnd          []*StartWarehousingInfo `gorm:"json:"warehouse_info_end"`
+	WarehouseOutInfoEnd         []*VmStockFlowTwenty
+	WarehouseOutInfoStart       []*VmStockFlowTwenty
+	WarehouseInfoEnd            []*VmStockFlowTwenty //期末入库量
+	StartFlowWarehouseInfo      []*VmStockFlowTwenty //本期增加
 
 	StWarehousingInfoTwo  []*StWarehousingInfoOne  `gorm:"json:"new_warehouse_info_start"` //期间增加
 	WarehouseOutInfoTenty []*WarehouseOutInfoTenty `gorm:"json:"new_warehouse_out_info"`   //减少
@@ -416,6 +416,7 @@ type VmBaseDrugTwenty struct {
 	Ctime                            int64             `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	Mtime                            int64             `gorm:"column:mtime" json:"mtime" form:"mtime"`
 	OrgId                            int64             `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	MedicalInsuranceNumber           string            `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
 	DrugFlowWarehouseInfo            []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_flow_info"`
 	DrugActFlowWarehouseInfo         []*DrugFlowTwenty `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"drug_act_flow_info"`
 	DrugWarehouseInfoStart           []*DrugFlowTwenty //期初入库结余

service/mobile_dialysis_service.go

@@ -2384,7 +2384,7 @@ func MobileGetDialysisSolutionByModeId(orgID int64, patientID int64, mode_id int
 	// cur_date := time.Now().Format("2006-01-02")
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(mode_id, 10) + ":dialysis_solution"
 	dialysis_solution_str, _ := redis.Get(key).Result()
-
+	redis.Set(key, "", time.Second*60)
 	if len(dialysis_solution_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err := readDb.Model(&models.DialysisSolution{}).Where("patient_id = ? and user_org_id = ? and status = 1 AND mode_id = ? and solution_status=1", patientID, orgID, mode_id).Last(&record).Error
 		if err != nil {

service/patient_dataconfig_service.go

@@ -9,6 +9,7 @@ import (
 )
 
 func GetPatientByID(orgID int64, patientID int64) (*models.Patients, error) {
+
 	var patient models.Patients
 	err := readDb.Model(&models.Patients{}).Where("id = ? and user_org_id=? and status=1 and lapseto = 1", patientID, orgID).First(&patient).Error
 	if err != nil {