Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/mobile_api_controllers/admin_user_api_controller.go

@@ -20,7 +20,7 @@ func (c *AdminUserApiController) GetAdminUserElectronicSignature() {
 	adminUserInfo := c.GetMobileAdminUserInfo()
 	//orgId, _ := service.GetCreatByOrgId(adminUserInfo.Org.Id)
 	id := adminUserInfo.AdminUser.Id
-	es, _ := service.GetAdminUserElectronicSignature(adminUserInfo.Org.Id, adminUserInfo.App.Id, id)
+	es, _ := service.GetAdminUserElectronicSignatureTwo(id)
 	if es != nil {
 		c.ServeSuccessJSON(map[string]interface{}{
 			"state":                1,

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -220,6 +220,7 @@ func (this *DialysisAPIController) WaitingScheduals() {
 // @param patient_id:int
 // @param date:string (yyyy-MM-dd)
 func (this *DialysisAPIController) DialysisRecord() {
+
 	patientID, _ := this.GetInt64("patient_id")
 	recordDateStr := this.GetString("date")
 	if patientID <= 0 {
@@ -284,6 +285,7 @@ func (this *DialysisAPIController) DialysisRecord() {
 	}
 
 	dialysisOrder, getDialysisOrderErr := service.MobileGetSchedualDialysisRecord(adminInfo.Org.Id, patientID, date.Unix())
+	fmt.Println("----------------------------", getDialysisOrderErr)
 	if getDialysisOrderErr != nil {
 		this.ErrorLog("获取透析记录失败:%v", getDialysisOrderErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -2080,6 +2080,7 @@ func (c *PatientApiController) GetDoctorAdvices() {
 }
 
 func (c *PatientApiController) GetPrintDialysisOrder() {
+	fmt.Println("触发-------------------------")
 	xtno := c.GetString("xtno")
 	xtdate := c.GetString("xtdate")
 
@@ -2154,7 +2155,6 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 	operators, _ := service.GetAdminUserES(adminUserInfo.Org.Id, adminUserInfo.App.Id, operatorIDs)
 	templateInfo, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 	check, _ := service.FindDoubleCheckById(adminUserInfo.Org.Id, patientInfo.ID, xttime)
-
 	c.ServeSuccessJSON(map[string]interface{}{
 		"users":                   adminUser,
 		"patientInfo":             patientInfo,

service/admin_service.go

@@ -273,6 +273,19 @@ func GetPatientAgeDistribution() ([]*PatientAgeCountStruct, error) {
 	return counts, nil
 }
 
+func GetAdminUserElectronicSignatureTwo(userid int64) (*models.AdminUserElectronicSignature, error) {
+	var es models.AdminUserElectronicSignature
+	err := readUserDb.Model(&models.AdminUserElectronicSignature{}).Where("creator=? and status=1", userid).First(&es).Error
+
+	if err == gorm.ErrRecordNotFound {
+		return nil, nil
+	}
+	if err != nil {
+		return nil, err
+	}
+	return &es, nil
+}
+
 func GetAdminUserElectronicSignature(orgID int64, appID int64, userID int64) (*models.AdminUserElectronicSignature, error) {
 	var es models.AdminUserElectronicSignature
 	err := readUserDb.Model(&models.AdminUserElectronicSignature{}).Where("org_id=? and app_id=? and creator=? and status=1", orgID, appID, userID).First(&es).Error

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -410,7 +410,7 @@ type ReceiveAssessmentVM struct {
 	PsychologicalAssessmentOther string `gorm:"column:psychological_assessment_other" json:"psychological_assessment_other"`
 	Score                        string `gorm:"column:score" json:"score"`
 	SickConditionOther           string `gorm:"column:sick_condition_other" json:"sick_condition_other"`
-	Precaution                   int64  `gorm:"column:precaution" json:"precaution"`
+	Precaution                   string `gorm:"column:precaution" json:"precaution"`
 	PrecautionOther              string `gorm:"column:precaution_other" json:"precaution_other"`
 	PsychologicalOther           string `gorm:"column:psychological_other" json:"psychological_other"`
 	IsPrecaution                 int64  `gorm:"column:is_precaution" json:"is_precaution"`
@@ -446,7 +446,7 @@ type XtReceiveTreatmentAsses struct {
 	PsychologicalAssessmentOther string `gorm:"column:psychological_assessment_other" json:"psychological_assessment_other" form:"psychological_assessment_other"`
 	IsPrecaution                 int64  `gorm:"column:is_precaution" json:"is_precaution" form:"is_precaution"`
 	Score                        string `gorm:"column:score" json:"score" form:"score"`
-	Precaution                   int64  `gorm:"column:precaution" json:"precaution" form:"precaution"`
+	Precaution                   string `gorm:"column:precaution" json:"precaution" form:"precaution"`
 	PrecautionOther              string `gorm:"column:precaution_other" json:"precaution_other" form:"precaution_other"`
 	PsychologicalOther           string `gorm:"column:psychological_other" json:"psychological_other" form:"psychological_other"`
 	AdmissionNumber              string `gorm:"column:admission_number" json:"admission_number" form:"admission_number"`