历史排班

controllers/patient_dataconfig_api_controller.go

@@ -48,8 +48,6 @@ func PatientDataConfigAPIControllerRegistRouters() {
 
 	beego.Router("/api/patient/getpatientsitemap", &PatientDataConfigAPIController{}, "Get:GetPatientSitemap")
 
-	beego.Router("/api/patient/updatesitemap", &PatientDataConfigAPIController{}, "Post:UpdateSiteMap")
-
 }
 
 type PatientDataConfigAPIController struct {
@@ -1590,134 +1588,10 @@ func (this *PatientDataConfigAPIController) GetPatientSitemap() {
 
 	sitemap, _ := service.GetPatientSitemap(patient_id, orgId)
 
+	patients, _ := service.GetPatientByIDOne(orgId, patient_id)
 	this.ServeSuccessJSON(map[string]interface{}{
-		"sitemap": sitemap,
+		"sitemap":  sitemap,
+		"patients": patients,
 	})
 
 }
-
-func (this *PatientDataConfigAPIController) UpdateSiteMap() {
-
-	//dataBody := make(map[string]interface{}, 0)
-	//err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	//if err != nil {
-	//	utils.ErrorLog(err.Error())
-	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//	return
-	//}
-	//
-	//is_append := int64(dataBody["is_append"].(float64))
-	//
-	//is_img_v := int64(dataBody["is_img_v"].(float64))
-	//
-	//is_img_a := int64(dataBody["is_img_a"].(float64))
-	//
-	//a_num := dataBody["a_num"].(float64)
-	//
-	//v_num := dataBody["v_num"].(float64)
-	//
-	//text_num := dataBody["text_num"].(float64)
-	//
-	//fangxianga_num := dataBody["fangxianga_num"].(float64)
-	//
-	//fangxianga_left := dataBody["fangxianga_left"].(float64)
-	//
-	//fangxianga_top := dataBody["fangxianga_top"].(float64)
-	//
-	//fangxiangv_left := dataBody["fangxiangv_left"].(float64)
-	//
-	//fangxiangv_top := dataBody["fangxiangv_top"].(float64)
-	//
-	//fuzhua_num := dataBody["fuzhua_num"].(float64)
-	//
-	//fuzhuv_num := dataBody["fuzhuv_num"].(float64)
-	//
-	//xuanzhuan_a := dataBody["xuanzhuan_a"].(float64)
-	//
-	//xuanzhuan_v := dataBody["xuanzhuan_v"].(float64)
-	//
-	//fuzhua_top := dataBody["fuzhua_top"].(float64)
-	//
-	//fuzhua_left := dataBody["fuzhua_left"].(float64)
-	//
-	//fuzhuv_top := dataBody["fuzhuv_top"].(float64)
-	//
-	//fuzhuv_left := dataBody["fuzhuv_left"].(float64)
-	//
-	//a_arr_str := dataBody["a_arr_str"].(string)
-	//
-	//v_arr_str := dataBody["v_arr_str"].(string)
-	//
-	//a_left := dataBody["a_left"].(float64)
-	//
-	//a_top := dataBody["a_top"].(float64)
-	//
-	//v_left := dataBody["v_left"].(float64)
-	//
-	//v_top := dataBody["v_top"].(float64)
-	//
-	//text_arr_str := dataBody["text_arr_str"].(string)
-	//
-	//text_left := dataBody["text_left"].(float64)
-	//
-	//text_top := dataBody["text_top"].(float64)
-	//
-	//scalev_num := dataBody["scalev_num"].(float64)
-	//
-	//scalea_num := dataBody["scalea_num"].(float64)
-	//
-	//value := dataBody["value"].(string)
-	//
-	//patient_id := int64(dataBody["patient_id"].(float64))
-	//
-	//id := int64(dataBody["id"].(float64))
-	//
-	//user_org_id := this.GetAdminUserInfo().CurrentOrgId
-	//
-	//deviceValsualMap := models.XtDeviceValsualMap{
-	//	ID:             id,
-	//	PatientId:      patient_id,
-	//	IsAppend:       is_append,
-	//	IsImgV:         is_img_v,
-	//	IsImgA:         is_img_a,
-	//	ANum:           a_num,
-	//	VNum:           v_num,
-	//	TextNum:        text_num,
-	//	FangxiangaNum:  fangxianga_num,
-	//	FangxiangaLeft: fangxianga_left,
-	//	FangxiangaTop:  fangxianga_top,
-	//	FangxiangvLeft: fangxiangv_left,
-	//	FangxiangvTop:  fangxiangv_top,
-	//	FuzhuaNum:      fuzhua_num,
-	//	FuzhuvNum:      fuzhuv_num,
-	//	XuanzhuanA:     xuanzhuan_a,
-	//	XuanzhuanV:     xuanzhuan_v,
-	//	FuzhuaTop:      fuzhua_top,
-	//	FuzhuaLeft:     fuzhua_left,
-	//	FuzhuvTop:      fuzhuv_top,
-	//	FuzhuvLeft:     fuzhuv_left,
-	//	AArrStr:        a_arr_str,
-	//	VArrStr:        v_arr_str,
-	//	ALeft:          a_left,
-	//	ATop:           a_top,
-	//	VLeft:          v_left,
-	//	VTop:           v_top,
-	//	TextArrStr:     text_arr_str,
-	//	TextLeft:       text_left,
-	//	TextTop:        text_top,
-	//	ScalevNum:      scalev_num,
-	//	ScaleaNum:      scalea_num,
-	//	Value:          value,
-	//	Status:         1,
-	//	UserOrgId:      user_org_id,
-	//}
-	//
-	//err = service.UpdateSiteMap(deviceValsualMap)
-	//
-	//if err != nil {
-	//	this.ServeSuccessJSON(map[string]interface{}{
-	//		"deviceValsualMap": deviceValsualMap,
-	//	})
-	//}
-
-}

models/patient_models.go

@@ -229,6 +229,7 @@ type Patients struct {
 	InfectiousRemark         string  `gorm:"column:infectious_remark" json:"infectious_remark" form:"infectious_remark"`
 	AllergicHistory          string  `gorm:"column:allergic_history" json:"allergic_history" form:"allergic_history"`
 	PatientAddress           string  `gorm:"column:patient_address" json:"patient_address" form:"patient_address"`
+	FirstLetter              string  `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (Patients) TableName() string {

service/his_service.go

@@ -107,15 +107,15 @@ func (VMHisOrder) TableName() string {
 }
 
 type Patients struct {
-	ID           int64  `gorm:"column:id" json:"id" form:"id"`
-	UserOrgId    int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Name         string `gorm:"column:name" json:"name" form:"name"`
-	Status       int64  `gorm:"column:status" json:"status" form:"status"`
-	IdCardNo     string `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
-	ScheduleType int64  `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
-	Phone        int64  `gorm:"column:phone" json:"phone" form:"phone"`
-	Gender       int64  `gorm:"column:gender" json:"gender" form:"gender"`
-
+	ID                    int64                 `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId             int64                 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Name                  string                `gorm:"column:name" json:"name" form:"name"`
+	Status                int64                 `gorm:"column:status" json:"status" form:"status"`
+	IdCardNo              string                `gorm:"column:id_card_no" json:"id_card_no" form:"id_card_no"`
+	ScheduleType          int64                 `gorm:"column:schedule_type" json:"schedule_type" form:"schedule_type"`
+	Phone                 int64                 `gorm:"column:phone" json:"phone" form:"phone"`
+	Gender                int64                 `gorm:"column:gender" json:"gender" form:"gender"`
+	FirstLetter           string                `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
 	HisPatient            HisPatient            `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
 	HisPrescription       []*HisPrescription    `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"prescription"`
@@ -202,6 +202,7 @@ type PatientTwo struct {
 	Schedule              Schedule              `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"schedule"`
 	HisPatient            []*HisPatientTwo      `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"his_patient"`
 	VMHisPrescriptionInfo VMHisPrescriptionInfo `gorm:"ForeignKey:PatientId;AssociationForeignKey:ID" json:"info"`
+	FirstLetter           string                `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 }
 
 func (PatientTwo) TableName() string {