历史排班

controllers/patient_dataconfig_api_controller.go

@@ -1173,9 +1173,12 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 	}
 	patient_id := int64(dataBody["patient_id"].(float64))
 	user_org_id := this.GetAdminUserInfo().CurrentOrgId
+	id := int64(dataBody["id"].(float64))
 
 	if dataBody["a_left"] != nil && reflect.TypeOf(dataBody["a_left"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["a_left"].([]interface{})
+
+		service.UpdateValsualAleft(patient_id, user_org_id)
 		for _, item := range prescriptions {
 			var a_num float64
 			var mark_num float64
@@ -1217,6 +1220,7 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 
 	if dataBody["fangxiang_a"] != nil && reflect.TypeOf(dataBody["fangxiang_a"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["fangxiang_a"].([]interface{})
+		service.ValsualMapFangxiangA(patient_id, user_org_id)
 		for _, item := range prescriptions {
 			var a_num float64
 			var mark_num float64
@@ -1255,6 +1259,7 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 
 	if dataBody["fangxiang_a"] != nil && reflect.TypeOf(dataBody["fangxiang_a"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["fangxiang_a"].([]interface{})
+		service.UpdateValsualMapFangxiangA(patient_id, user_org_id)
 		for _, item := range prescriptions {
 			var a_num float64
 			var mark_num float64
@@ -1292,8 +1297,9 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 	fangxiang_v_num := dataBody["fangxiang_v_num"].(float64)
 	fangxiang_v_top := dataBody["fangxiang_v_top"].(float64)
 
-	if dataBody["fangxiang_a"] != nil && reflect.TypeOf(dataBody["fangxiang_a"]).String() == "[]interface {}" {
+	if dataBody["fangxiang_v"] != nil && reflect.TypeOf(dataBody["fangxiang_v"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["fangxiang_a"].([]interface{})
+		service.UpdateValsualMapFangxiangV(patient_id, user_org_id)
 		for _, item := range prescriptions {
 			var a_num float64
 			var mark_num float64
@@ -1309,7 +1315,7 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 				mark_top = item.(map[string]interface{})["top"].(float64)
 			}
 
-			ValsualMapFangxiangA := models.XtDeviceValsualMapFangxiangA{
+			ValsualMapFangxiangA := models.XtDeviceValsualMapFangxiangV{
 
 				PatientId: patient_id,
 				UserOrgId: user_org_id,
@@ -1322,7 +1328,7 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 				Mtime:     time.Now().Unix(),
 			}
 
-			service.CreateValsualMapFangxiangA(ValsualMapFangxiangA)
+			service.CreateValsualMapFangxiangV(ValsualMapFangxiangA)
 		}
 
 	}
@@ -1331,6 +1337,7 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 
 	if dataBody["fuzhu_a"] != nil && reflect.TypeOf(dataBody["fuzhu_a"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["fuzhu_a"].([]interface{})
+		service.UpdateValSualFuzhA(patient_id, user_org_id)
 		for _, item := range prescriptions {
 			var a_left float64
 			var a_markNum float64
@@ -1366,7 +1373,9 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 	fuzhu_a_top := dataBody["fuzhu_a_top"].(float64)
 
 	if dataBody["fuzhu_v"] != nil && reflect.TypeOf(dataBody["fuzhu_v"]).String() == "[]interface {}" {
-		prescriptions, _ := dataBody["fuzhu_a"].([]interface{})
+		prescriptions, _ := dataBody["fuzhu_v"].([]interface{})
+
+		service.UpdateVasuaLfuzhuV(patient_id, user_org_id)
 		for _, item := range prescriptions {
 			var v_left float64
 			var v_markNum float64
@@ -1408,6 +1417,8 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 
 	if dataBody["text_arr"] != nil && reflect.TypeOf(dataBody["text_arr"]).String() == "[]interface {}" {
 		prescriptions, _ := dataBody["text_arr"].([]interface{})
+
+		service.UpdateTextArr(patient_id, user_org_id)
 		for _, item := range prescriptions {
 			var left float64
 			var text_markNum string
@@ -1417,7 +1428,7 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 				left = item.(map[string]interface{})["left"].(float64)
 			}
 			if item.(map[string]interface{})["text"] != nil || reflect.TypeOf(item.(map[string]interface{})["text"]).String() == "string" {
-				text_markNum = item.(map[string]interface{})["v_markNum"].(string)
+				text_markNum = item.(map[string]interface{})["text"].(string)
 			}
 
 			if item.(map[string]interface{})["top"] != nil || reflect.TypeOf(item.(map[string]interface{})["top"]).String() == "float64" {
@@ -1450,6 +1461,7 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 
 		if dataBody["v_left"] != nil && reflect.TypeOf(dataBody["v_left"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["v_left"].([]interface{})
+			service.UpdateValsualVleft(patient_id, user_org_id)
 			for _, item := range prescriptions {
 				var v_num float64
 				var markNum float64
@@ -1482,6 +1494,7 @@ func (this *PatientDataConfigAPIController) SaveSiteMap() {
 		xuanzhuan_v := dataBody["xuanzhuan_v"].(float64)
 
 		deviceValsualMap := models.XtDeviceValsualMap{
+			ID:             id,
 			PatientId:      patient_id,
 			IsAppend:       is_append,
 			IsImgV:         is_img_v,

models/patient_models.go

@@ -2158,6 +2158,13 @@ type XtDeviceValsualMap struct {
 	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"`
 }
 
 func (XtDeviceValsualMap) TableName() string {
@@ -2197,6 +2204,23 @@ func (XtDeviceValsualMapFangxiangA) TableName() string {
 	return "xt_device_valsual_map_fangxiang_a"
 }
 
+type XtDeviceValsualMapFangxiangV struct {
+	ID        int64   `gorm:"column:id" json:"id" form:"id"`
+	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	UserOrgId int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64   `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	MarkNum   float64 `gorm:"column:mark_num" json:"mark_num" form:"mark_num"`
+	Left      float64 `gorm:"column:left" json:"left" form:"left"`
+	Top       float64 `gorm:"column:top" json:"top" form:"top"`
+	MapId     int64   `gorm:"column:map_id" json:"map_id" form:"map_id"`
+}
+
+func (XtDeviceValsualMapFangxiangV) TableName() string {
+	return "xt_device_valsual_map_fangxiang_v"
+}
+
 type XtDeviceValsualFuzhuA struct {
 	ID        int64   `gorm:"column:id" json:"id" form:"id"`
 	PatientId int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`

service/manage_service.go

@@ -1775,7 +1775,7 @@ func GetRegistrationDisinfectList(limit int64, page int64, start_time int64, end
 	if user_org_id > 0 {
 		db = db.Where("user_org_id = ?", user_org_id)
 	}
-	err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&list).Error
 	return list, total, err
 }
 

service/patient_service.go

@@ -3077,7 +3077,7 @@ func GetBaseDrugByName(drug_name string, org_id int64) (models.BaseDrugLibSeven,
 
 func CreateDeviceValsualMap(valsualMap models.XtDeviceValsualMap) error {
 
-	err := XTWriteDB().Create(&valsualMap).Error
+	err := XTWriteDB().Save(&valsualMap).Error
 
 	return err
 }
@@ -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).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("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
 }
 
@@ -3101,32 +3101,86 @@ func CreateValsualAleft(left models.XtDeviceValsualALeft) error {
 	return err
 }
 
+func UpdateValsualAleft(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualALeft{}).Where("patient_id = ? and user_org_id = ? and status =1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func CreateValsualMapFangxiangA(a models.XtDeviceValsualMapFangxiangA) error {
 
 	err := XTWriteDB().Create(&a).Error
 	return err
 }
 
+func UpdateValsualMapFangxiangA(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualMapFangxiangA{}).Where("patient_id = ? and user_org_id = ? and status =1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func CreateValsualMapFangxiangV(v models.XtDeviceValsualMapFangxiangV) error {
+
+	err := XTWriteDB().Create(&v).Error
+	return err
+}
+
+func UpdateValsualMapFangxiangV(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualMapFangxiangV{}).Where("patient_id = ? and user_org_id = ? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
+func ValsualMapFangxiangA(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(models.XtDeviceValsualMapFangxiangA{}).Where("patient_id = ? and user_org_id = ? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func CreateValSualFuzhA(a models.XtDeviceValsualFuzhuA) error {
 
 	err := XTReadDB().Create(&a).Error
 	return err
 }
 
+func UpdateValSualFuzhA(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualFuzhuA{}).Where("patient_id =? and user_org_id = ? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func CreateVasuaLfuzhuV(v models.XtDeviceValsualFuzhuV) error {
 
 	err := XTReadDB().Create(&v).Error
 	return err
 }
 
+func UpdateVasuaLfuzhuV(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualFuzhuV{}).Where("patient_id = ? and user_org_id =? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func CreateTextArr(arr models.XtDeviceValsualTextArr) error {
 
 	err := XTReadDB().Create(&arr).Error
 	return err
 }
 
+func UpdateTextArr(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualTextArr{}).Where("patient_id = ? and user_org_id = ? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}
+
 func CreateValsualVleft(left models.XtDeviceValsualVLeft) error {
 
 	err = XTReadDB().Create(&left).Error
 	return err
 }
+
+func UpdateValsualVleft(patient_id int64, user_org_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtDeviceValsualVLeft{}).Where("patient_id = ? and user_org_id =? and status=1", patient_id, user_org_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}