历史排班

controllers/patient_dataconfig_api_controller.go

@@ -1372,6 +1372,9 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 	fuzhu_a_num := dataBody["fuzhu_a_num"].(float64)
 	fuzhu_a_top := dataBody["fuzhu_a_top"].(float64)
 
+	left_a := dataBody["left_a"].(float64)
+	left_v := dataBody["left_v"].(float64)
+
 	if dataBody["fuzhu_v"] != nil && reflect.TypeOf(dataBody["fuzhu_v"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["fuzhu_v"].([]interface{})
 
@@ -1525,6 +1528,8 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 			VTop:           v_top,
 			XuanzhuanA:     xuanzhuan_a,
 			XuanzhuanV:     xuanzhuan_v,
+			ALeft:          left_a,
+			VLeft:          left_v,
 		}
 
 		err = service.CreateDeviceValsualMap(deviceValsualMap)

models/good_models.go

@@ -35,37 +35,37 @@ func (NewGoodsType) TableName() string {
 }
 
 type GoodInfo struct {
-	ID                     int64   `gorm:"column:id" json:"id" form:"id"`
-	GoodCode               string  `gorm:"column:good_code" json:"good_code" form:"good_code"`
-	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"`
-	GoodUnit               int64   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
-	BuyPrice               float64 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	SellPrice              float64 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
-	Remark                 string  `gorm:"column:remark" json:"remark" form:"remark"`
-	Ctime                  int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime                  int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Manufacturer           int64   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
-	Dealer                 int64   `gorm:"column:dealer" json:"dealer" form:"dealer"`
-	ExpiryDateWarnDayCount int64   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
-	StockWarnCount         int64   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
-	IsReuse                int64   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
-	Status                 int64   `gorm:"column:status" json:"status" form:"status"`
-	FilmArea               string  `gorm:"column:film_area" json:"film_area" form:"film_area"`
-	IsUse                  int64   `gorm:"column:is_use" json:"is_use" form:"is_use"`
-	FilmMaterialQuality    string  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
-	OrgId                  int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	Modifier               int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
-	Creater                int64   `gorm:"column:creater" json:"creater" form:"creater"`
-	GoodName               string  `gorm:"column:good_name" json:"good_name" form:"good_name"`
-	Pinyin                 string  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
-	Wubi                   string  `gorm:"column:wubi" json:"wubi" form:"wubi"`
-	GoodKind               int64   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
-	MedicalInsuranceLevel  int64   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
-	RetailPrice            float64 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
-	MedicalInsuranceNumber string  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
-	ProvincesCode          string  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
-
+	ID                          int64                   `gorm:"column:id" json:"id" form:"id"`
+	GoodCode                    string                  `gorm:"column:good_code" json:"good_code" form:"good_code"`
+	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"`
+	GoodUnit                    int64                   `gorm:"column:good_unit" json:"good_unit" form:"good_unit"`
+	BuyPrice                    float64                 `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
+	SellPrice                   float64                 `gorm:"column:sell_price" json:"sell_price" form:"sell_price"`
+	Remark                      string                  `gorm:"column:remark" json:"remark" form:"remark"`
+	Ctime                       int64                   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime                       int64                   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Manufacturer                int64                   `gorm:"column:manufacturer" json:"manufacturer" form:"manufacturer"`
+	Dealer                      int64                   `gorm:"column:dealer" json:"dealer" form:"dealer"`
+	ExpiryDateWarnDayCount      int64                   `gorm:"column:expiry_date_warn_day_count" json:"expiry_date_warn_day_count" form:"expiry_date_warn_day_count"`
+	StockWarnCount              int64                   `gorm:"column:stock_warn_count" json:"stock_warn_count" form:"stock_warn_count"`
+	IsReuse                     int64                   `gorm:"column:is_reuse" json:"is_reuse" form:"is_reuse"`
+	Status                      int64                   `gorm:"column:status" json:"status" form:"status"`
+	FilmArea                    string                  `gorm:"column:film_area" json:"film_area" form:"film_area"`
+	IsUse                       int64                   `gorm:"column:is_use" json:"is_use" form:"is_use"`
+	FilmMaterialQuality         string                  `gorm:"column:film_material_quality" json:"film_material_quality" form:"film_material_quality"`
+	OrgId                       int64                   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	Modifier                    int64                   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Creater                     int64                   `gorm:"column:creater" json:"creater" form:"creater"`
+	GoodName                    string                  `gorm:"column:good_name" json:"good_name" form:"good_name"`
+	Pinyin                      string                  `gorm:"column:pinyin" json:"pinyin" form:"pinyin"`
+	Wubi                        string                  `gorm:"column:wubi" json:"wubi" form:"wubi"`
+	GoodKind                    int64                   `gorm:"column:good_kind" json:"good_kind" form:"good_kind"`
+	MedicalInsuranceLevel       int64                   `gorm:"column:medical_insurance_level" json:"medical_insurance_level" form:"medical_insurance_level"`
+	RetailPrice                 float64                 `gorm:"column:retail_price" json:"retail_price" form:"retail_price"`
+	MedicalInsuranceNumber      string                  `gorm:"column:medical_insurance_number" json:"medical_insurance_number" form:"medical_insurance_number"`
+	ProvincesCode               string                  `gorm:"column:provinces_code" json:"provinces_code" form:"provinces_code"`
+	FirstLetter                 string                  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	IsSpecialDiseases           int64                   `gorm:"column:is_special_diseases" json:"is_special_diseases" form:"is_special_diseases"`
 	IsRecord                    int64                   `gorm:"column:is_record" json:"is_record" form:"is_record"`
 	StatisticsCategory          int64                   `gorm:"column:statistics_category" json:"statistics_category" form:"statistics_category"`

models/his_models.go

@@ -602,6 +602,7 @@ type HisProject struct {
 	SingleDose                  string  `gorm:"column:single_dose" json:"single_dose" form:"single_dose"`
 	ExecutionFrequency          string  `gorm:"column:execution_frequency" json:"execution_frequency" form:"execution_frequency"`
 	IsPrint                     int64   `gorm:"column:is_print" json:"is_print" form:"is_print"`
+	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (HisProject) TableName() string {

models/patient_models.go

@@ -2127,44 +2127,46 @@ func (XtScheduleLog) TableName() string {
 }
 
 type XtDeviceValsualMap struct {
-	ID             int64   `gorm:"column:id" json:"id" form:"id"`
-	PatientId      int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
-	IsAppend       int64   `gorm:"column:is_append" json:"is_append" form:"is_append"`
-	IsImgV         int64   `gorm:"column:is_img_v" json:"is_img_v" form:"is_img_v"`
-	IsImgA         int64   `gorm:"column:is_img_a" json:"is_img_a" form:"is_img_a"`
-	VNum           float64 `gorm:"column:v_num" json:"v_num" form:"v_num"`
-	Status         int64   `gorm:"column:status" json:"status" form:"status"`
-	UserOrgId      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	ATop           float64 `gorm:"column:a_top" json:"a_top" form:"a_top"`
-	AvBkx          float64 `gorm:"column:av_bkx" json:"av_bkx" form:"av_bkx"`
-	AvBky          float64 `gorm:"column:av_bky" json:"av_bky" form:"av_bky"`
-	FangxiangALeft float64 `gorm:"column:fangxiang_a_left" json:"fangxiang_a_left" form:"fangxiang_a_left"`
-	FangxiangANum  float64 `gorm:"column:fangxiang_a_num" json:"fangxiang_a_num" form:"fangxiang_a_num"`
-	FangxiangATop  float64 `gorm:"column:fangxiang_a_top" json:"fangxiang_a_top" form:"fangxiang_a_top"`
-	FangxiangVLeft float64 `gorm:"column:fangxiang_v_left" json:"fangxiang_v_left" form:"fangxiang_v_left"`
-	FangxiangVNum  float64 `gorm:"column:fangxiang_v_num" json:"fangxiang_v_num" form:"fangxiang_v_num"`
-	FangxiangVTop  float64 `gorm:"column:fangxiang_v_top" json:"fangxiang_v_top" form:"fangxiang_v_top"`
-	FuzhuALeft     float64 `gorm:"column:fuzhu_a_left" json:"fuzhu_a_left" form:"fuzhu_a_left"`
-	FuzhuANum      float64 `gorm:"column:fuzhu_a_num" json:"fuzhu_a_num" form:"fuzhu_a_num"`
-	FuzhuATop      float64 `gorm:"column:fuzhu_a_top" json:"fuzhu_a_top" form:"fuzhu_a_top"`
-	FuzhuVLeft     float64 `gorm:"column:fuzhu_v_left" json:"fuzhu_v_left" form:"fuzhu_v_left"`
-	FuzhuVNum      float64 `gorm:"column:fuzhu_v_num" json:"fuzhu_v_num" form:"fuzhu_v_num"`
-	FuzhuVTop      float64 `gorm:"column:fuzhu_v_top" json:"fuzhu_v_top" form:"fuzhu_v_top"`
-	ScaleaNum      float64 `gorm:"column:scalea_num" json:"scalea_num" form:"scalea_num"`
-	ScalevNum      float64 `gorm:"column:scalev_num" json:"scalev_num" form:"scalev_num"`
-	TextLeft       float64 `gorm:"column:text_left" json:"text_left" form:"text_left"`
-	TextNum        float64 `gorm:"column:text_num" json:"text_num" form:"text_num"`
-	TextTop        float64 `gorm:"column:text_top" json:"text_top" form:"text_top"`
-	VTop           float64 `gorm:"column:v_top" json:"v_top" form:"v_top"`
-	XuanzhuanA     float64 `gorm:"column:xuanzhuan_a" json:"xuanzhuan_a" form:"xuanzhuan_a"`
-	XuanzhuanV     float64 `gorm:"column:xuanzhuan_v" json:"xuanzhuan_v" form:"xuanzhuan_v"`
-
-	XtDeviceValsualALeft         XtDeviceValsualALeft         `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualALeft"`
-	XtDeviceValsualMapFangxiangA XtDeviceValsualMapFangxiangA `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualMapFangxiangA"`
-	XtDeviceValsualMapFangxiangV XtDeviceValsualMapFangxiangV `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualMapFangxiangV"`
-	XtDeviceValsualFuzhuA        XtDeviceValsualFuzhuA        `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualFuzhuA"`
-	XtDeviceValsualFuzhuV        XtDeviceValsualFuzhuV        `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualFuzhuV"`
-	XtDeviceValsualTextArr       XtDeviceValsualTextArr       `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualTextArr"`
+	ID                           int64                           `gorm:"column:id" json:"id" form:"id"`
+	PatientId                    int64                           `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	IsAppend                     int64                           `gorm:"column:is_append" json:"is_append" form:"is_append"`
+	IsImgV                       int64                           `gorm:"column:is_img_v" json:"is_img_v" form:"is_img_v"`
+	IsImgA                       int64                           `gorm:"column:is_img_a" json:"is_img_a" form:"is_img_a"`
+	VNum                         float64                         `gorm:"column:v_num" json:"v_num" form:"v_num"`
+	Status                       int64                           `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId                    int64                           `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	ATop                         float64                         `gorm:"column:a_top" json:"a_top" form:"a_top"`
+	AvBkx                        float64                         `gorm:"column:av_bkx" json:"av_bkx" form:"av_bkx"`
+	AvBky                        float64                         `gorm:"column:av_bky" json:"av_bky" form:"av_bky"`
+	FangxiangALeft               float64                         `gorm:"column:fangxiang_a_left" json:"fangxiang_a_left" form:"fangxiang_a_left"`
+	FangxiangANum                float64                         `gorm:"column:fangxiang_a_num" json:"fangxiang_a_num" form:"fangxiang_a_num"`
+	FangxiangATop                float64                         `gorm:"column:fangxiang_a_top" json:"fangxiang_a_top" form:"fangxiang_a_top"`
+	FangxiangVLeft               float64                         `gorm:"column:fangxiang_v_left" json:"fangxiang_v_left" form:"fangxiang_v_left"`
+	FangxiangVNum                float64                         `gorm:"column:fangxiang_v_num" json:"fangxiang_v_num" form:"fangxiang_v_num"`
+	FangxiangVTop                float64                         `gorm:"column:fangxiang_v_top" json:"fangxiang_v_top" form:"fangxiang_v_top"`
+	FuzhuALeft                   float64                         `gorm:"column:fuzhu_a_left" json:"fuzhu_a_left" form:"fuzhu_a_left"`
+	FuzhuANum                    float64                         `gorm:"column:fuzhu_a_num" json:"fuzhu_a_num" form:"fuzhu_a_num"`
+	FuzhuATop                    float64                         `gorm:"column:fuzhu_a_top" json:"fuzhu_a_top" form:"fuzhu_a_top"`
+	FuzhuVLeft                   float64                         `gorm:"column:fuzhu_v_left" json:"fuzhu_v_left" form:"fuzhu_v_left"`
+	FuzhuVNum                    float64                         `gorm:"column:fuzhu_v_num" json:"fuzhu_v_num" form:"fuzhu_v_num"`
+	FuzhuVTop                    float64                         `gorm:"column:fuzhu_v_top" json:"fuzhu_v_top" form:"fuzhu_v_top"`
+	ScaleaNum                    float64                         `gorm:"column:scalea_num" json:"scalea_num" form:"scalea_num"`
+	ScalevNum                    float64                         `gorm:"column:scalev_num" json:"scalev_num" form:"scalev_num"`
+	TextLeft                     float64                         `gorm:"column:text_left" json:"text_left" form:"text_left"`
+	TextNum                      float64                         `gorm:"column:text_num" json:"text_num" form:"text_num"`
+	TextTop                      float64                         `gorm:"column:text_top" json:"text_top" form:"text_top"`
+	VTop                         float64                         `gorm:"column:v_top" json:"v_top" form:"v_top"`
+	XuanzhuanA                   float64                         `gorm:"column:xuanzhuan_a" json:"xuanzhuan_a" form:"xuanzhuan_a"`
+	XuanzhuanV                   float64                         `gorm:"column:xuanzhuan_v" json:"xuanzhuan_v" form:"xuanzhuan_v"`
+	ALeft                        float64                         `gorm:"column:a_left" json:"a_left" form:"a_left"`
+	VLeft                        float64                         `gorm:"column:v_left" json:"v_left" form:"v_left"`
+	XtDeviceValsualALeft         []*XtDeviceValsualALeft         `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualALeft"`
+	XtDeviceValsualMapFangxiangA []*XtDeviceValsualMapFangxiangA `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualMapFangxiangA"`
+	XtDeviceValsualMapFangxiangV []*XtDeviceValsualMapFangxiangV `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualMapFangxiangV"`
+	XtDeviceValsualFuzhuA        []*XtDeviceValsualFuzhuA        `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualFuzhuA"`
+	XtDeviceValsualFuzhuV        []*XtDeviceValsualFuzhuV        `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualFuzhuV"`
+	XtDeviceValsualTextArr       []*XtDeviceValsualTextArr       `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"DeviceValsualTextArr"`
+	XtDeviceValsualVLeft         []*XtDeviceValsualVLeft         `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"XtDeviceValsualVLeft"`
 }
 
 func (XtDeviceValsualMap) TableName() string {

service/his_service.go

@@ -805,6 +805,7 @@ type BaseDrugLib struct {
 	IsUser                      int64   `gorm:"column:is_user" json:"is_user" form:"is_user"`
 	SumCount                    int64   `gorm:"column:sum_count" json:"sum_count" form:"sum_count"`
 	SumInCount                  int64   `gorm:"column:sum_in_count" json:"sum_in_count" form:"sum_in_count"`
+	FirstLetter                 string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	//MedicineInsurancePercentage []*MedicineInsurancePercentage `gorm:"ForeignKey:PatientId;AssociationForeignKey:PatientId" json:"monitoring_record"`
 	OtherDrugWarehouseInfo []*OtherDrugWarehouseInfo `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"stock_in"`
 	VMDrugSalesReturnInfo  []*VMDrugSalesReturnInfo  `gorm:"ForeignKey:DrugId;AssociationForeignKey:ID" json:"sales_return"`

service/patient_service.go

@@ -3085,7 +3085,7 @@ func CreateDeviceValsualMap(valsualMap models.XtDeviceValsualMap) error {
 func GetPatientSitemap(patient_id int64, user_org_id int64) (models.XtDeviceValsualMap, error) {
 
 	valsualMap := models.XtDeviceValsualMap{}
-	err := XTReadDB().Where("patient_id = ? and status =1 and user_org_id = ?", patient_id, user_org_id).Preload("XtDeviceValsualALeft", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualMapFangxiangA", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualMapFangxiangV", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualFuzhuA", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualFuzhuV", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualTextArr", "status=1 and user_org_id =?", user_org_id).Find(&valsualMap).Error
+	err := XTReadDB().Where("patient_id = ? and status =1 and user_org_id = ?", patient_id, user_org_id).Preload("XtDeviceValsualALeft", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualVLeft", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualMapFangxiangA", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualMapFangxiangV", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualFuzhuA", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualFuzhuV", "status=1 and user_org_id =?", user_org_id).Preload("XtDeviceValsualTextArr", "status=1 and user_org_id =?", user_org_id).Find(&valsualMap).Error
 	return valsualMap, err
 }