Merge branch '20201014_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20201014_xt_api_new_branch

controllers/dialysis_record_api_controller.go

@@ -228,8 +228,8 @@ func (this *DialysisRecordAPIController) DialysisSchedule() {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
 		return
 	}
-	//dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolution(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
-	dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolutionOne(adminInfo.CurrentOrgId, schedual.ModeId)
+	dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolution(adminInfo.CurrentOrgId, patientID, schedual.ModeId)
+	//dialysisSolution, getDialysisSolutionErr := service.GetDialysisSolutionOne(adminInfo.CurrentOrgId, schedual.ModeId)
 
 	if getDialysisSolutionErr != nil {
 		this.ErrorLog("获取透析方案失败:%v", getDialysisSolutionErr)

controllers/his_api_controller.go

@@ -917,7 +917,7 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 
 	blood_fat := c.GetString("blood_fat")
 	bloodfatfloat, _ := strconv.ParseFloat(blood_fat, 64)
-	//fmt.Println("33333333", bloodfatfloat)
+
 	blood_sugar := c.GetString("blood_sugar")
 	bloodsugarfloat, _ := strconv.ParseFloat(blood_sugar, 64)
 	fmt.Println(bloodsugarfloat)
@@ -927,9 +927,9 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 	dbpfloat, _ := strconv.ParseFloat(dbp, 64)
 	delivery_way, _ := c.GetInt64("delivery_way")
 	diagnostic := c.GetString("diagnostic")
-	fmt.Println("diagnostic", diagnostic)
+
 	family_history := c.GetString("family_history")
-	fmt.Println(family_history)
+
 	height := c.GetString("height")
 	history_of_present_illness := c.GetString("history_of_present_illness")
 	is_infect, _ := c.GetInt64("is_infect")
@@ -957,12 +957,15 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 	doctor_advice := c.GetString("doctor_advice")
 	remark := c.GetString("remark")
 	breathingfloat, _ := strconv.ParseFloat(breathing, 64)
-	//fmt.Println("breathingfloat", breathingfloat)
+
 	sick, _ := c.GetInt64("sick")
 	diagnose, _ := c.GetInt64("diagnose")
+	id, _ := c.GetInt64("id")
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+	allergic_history := c.GetString("allergic_history")
 	if err != nil {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -1008,17 +1011,30 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 		Remark:                  remark,
 		Sick:                    sick,
 		Diagnose:                diagnose,
+		AllergicHistory:         allergic_history,
 	}
-
-	err = service.SaveHisPatientCaseHistory(&caseHistory)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+	//查询该患者是否有病历
+	_, errcodes := service.GetHisPatientCaseHistoryById(id)
+	if errcodes == gorm.ErrRecordNotFound {
+		err = service.SaveHisPatientCaseHistory(&caseHistory)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"caseHistory": caseHistory,
+		})
 		return
+	} else if errcodes == nil {
+		err := service.UpdatePatientCaseHistory(id, &caseHistory)
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"caseHistory": caseHistory,
+		})
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"caseHistory": caseHistory,
-	})
-	return
 
 	//查询该患者是否有病历
 	//_, errcode := service.GetHisPatientCaseHistoryById(his_patient_id)

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -335,7 +335,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 
 	template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
 
-	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 {
+	if template.TemplateId == 22 || template.TemplateId == 17 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 27 || template.TemplateId == 34 || template.TemplateId == 30 || template.TemplateId == 32 {
 		dewater_amount = dewater_amount * 1000
 	}
 

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1158,11 +1158,11 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		PreImpulse:                 pre_impulse,
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
-		Blood:                    blood,
-		DialysisDialyszers:       dialysis_dialyszers,
-		DialysisIrrigation:       dialysis_irrigation,
-		AntioxidantCommodityName: antioxidant_commodity_name,
-		DisplaceSpeed:            displace_speed,
+		Blood:                      blood,
+		DialysisDialyszers:         dialysis_dialyszers,
+		DialysisIrrigation:         dialysis_irrigation,
+		AntioxidantCommodityName:   antioxidant_commodity_name,
+		DisplaceSpeed:              displace_speed,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -2039,11 +2039,11 @@ func (c *DialysisAPIController) PostSolution() {
 		ALiquid:                   a_liquid,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
-		Blood:                    blood,
-		DialysisDialyszers:       dialysis_dialyszers,
-		DialysisIrrigation:       dialysis_irrigation,
-		AntioxidantCommodityName: antioxidant_commodity_name,
-		DisplaceSpeed:            displace_speed,
+		Blood:                     blood,
+		DialysisDialyszers:        dialysis_dialyszers,
+		DialysisIrrigation:        dialysis_irrigation,
+		AntioxidantCommodityName:  antioxidant_commodity_name,
+		DisplaceSpeed:             displace_speed,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -4692,3 +4692,29 @@ func (c *DialysisAPIController) BathDeleteAdviceList() {
 	})
 	return
 }
+
+func (c *DialysisAPIController) UpdateAutoReduceDetail() {
+
+	good_id, _ := c.GetInt64("good_id")
+	count, _ := c.GetInt64("count")
+	record_time, _ := c.GetInt64("record_time")
+	patient_id, _ := c.GetInt64("patient_id")
+	detail, _ := service.UpdateAutoReduceDetail(good_id, count, record_time, patient_id)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"detail": detail,
+	})
+	return
+}
+
+func (c *DialysisAPIController) DeleteAutoReduceDetail() {
+
+	good_id, _ := c.GetInt64("good_id")
+	record_time, _ := c.GetInt64("record_time")
+	patient_id, _ := c.GetInt64("patient_id")
+	err := service.DeleteAutoReduceDetail(good_id, record_time, patient_id)
+	fmt.Print("err", err)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "批量删除成功",
+	})
+	return
+}

controllers/mobile_api_controllers/mobile_api_router_register.go

@@ -144,5 +144,9 @@ func MobileAPIControllersRegisterRouters() {
 	//获取单个患者1年的透析日期
 	beego.Router("/m/api/getPatientDialysisRecord", &DialysisAPIController{}, "Get:GetPatientDialysisRecordList")
 	//批量删除医嘱
-	//beego.Router("/m/api/batchDeleteAdvice", &DialysisAPIController{}, "Get:BathDeleteAdviceList:")
+	beego.Router("/m/api/batchdeleteadvice", &DialysisAPIController{}, "Get:BathDeleteAdviceList")
+	//加减耗材数量
+	beego.Router("/m/api/updateautoreducedetail", &DialysisAPIController{}, "Get:UpdateAutoReduceDetail")
+	//删除数据
+	beego.Router("/m/api/deleteautoreducedetail", &DialysisAPIController{}, "Get:DeleteAutoReduceDetail")
 }

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1545,7 +1545,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 {
 			dewater_amount = dewater_amount * 1000
 
 		}

controllers/role_controller.go

@@ -982,33 +982,33 @@ func (this *RoleAPIController) AddAdmin() {
 			if total <= 0 {
 				//新增用户
 				app_role := &models.App_Role{
-					AdminUserId:    adminUser.Id,
-					OrgId:          adminUserInfo.CurrentOrgId,
-					AppId:          adminUserInfo.CurrentAppId,
-					Avatar:         "",
-					UserName:       name,
-					UserTitleName:  user_title_name,
-					Status:         1,
-					UserType:       int8(userType),
-					UserTitle:      int8(userTitle),
-					CreateTime:     time.Now().Unix(),
-					ModifyTime:     time.Now().Unix(),
-					RoleIds:        roleIds,
-					Department:     department,
-					DepartmentId:   department_id,
-					Sex:            sex,
-					Age:            age,
-					Nation:         nation,
-					CardType:       card_type,
-					IdCard:         id_card,
-					Education:      education,
-					StudyMajorName: study_major_name,
-					WorkMajorName:  work_major_name,
-					RoleType:       role_type,
-					MedicalCode:    medical_code,
-					DoctorCode:     doctor_code,
-					Licensing:      licensing,
-					JobNumber:      job_number,
+					AdminUserId:                             adminUser.Id,
+					OrgId:                                   adminUserInfo.CurrentOrgId,
+					AppId:                                   adminUserInfo.CurrentAppId,
+					Avatar:                                  "",
+					UserName:                                name,
+					UserTitleName:                           user_title_name,
+					Status:                                  1,
+					UserType:                                int8(userType),
+					UserTitle:                               int8(userTitle),
+					CreateTime:                              time.Now().Unix(),
+					ModifyTime:                              time.Now().Unix(),
+					RoleIds:                                 roleIds,
+					Department:                              department,
+					DepartmentId:                            department_id,
+					Sex:                                     sex,
+					Age:                                     age,
+					Nation:                                  nation,
+					CardType:                                card_type,
+					IdCard:                                  id_card,
+					Education:                               education,
+					StudyMajorName:                          study_major_name,
+					WorkMajorName:                           work_major_name,
+					RoleType:                                role_type,
+					MedicalCode:                             medical_code,
+					DoctorCode:                              doctor_code,
+					Licensing:                               licensing,
+					JobNumber:                               job_number,
 					PrescriptionQualificationIdentification: prescription_qualification_identification,
 					IdentificationOutpatients:               identification_outpatients,
 					StartTime:                               theStartTime.Unix(),
@@ -1126,7 +1126,7 @@ func (this *RoleAPIController) EditAdmin() {
 	department := this.GetString("department")
 	department_id, _ := this.GetInt64("department_id")
 	sort, _ := this.GetInt64("sort")
-
+	sex, _ := this.GetInt64("sex")
 	age, _ := this.GetInt64("age")
 	nation := this.GetString("nation")
 	card_type, _ := this.GetInt64("card_type")
@@ -1215,6 +1215,7 @@ func (this *RoleAPIController) EditAdmin() {
 	appRole.OutpatientIllnesscategory = outpatient_illnessCategory
 	appRole.IsActive = is_active
 	appRole.ActiveStatus = active_status
+	appRole.Sex = sex
 	saveErr := service.SaveAppRole(appRole)
 	if saveErr != nil {
 		//beego.Error("修改App_Role失败:", saveErr)

models/his_models.go

@@ -297,6 +297,7 @@ type HisPatientCaseHistory struct {
 	Remark                  string  `gorm:"column:remark" json:"remark" form:"remark"`
 	Sick                    int64   `gorm:"column:sick" json:"sick" form:"sick"`
 	Diagnose                int64   `gorm:"column:diagnose" json:"diagnose" form:"diagnose"`
+	AllergicHistory         string  `gorm:"column:allergic_history" json:"allergic_history" form:"allergic_history"`
 }
 
 func (HisPatientCaseHistory) TableName() string {

service/his_service.go

@@ -243,9 +243,9 @@ func SaveHisPatientCaseHistoryTemplate(template models.HisCaseHistoryTemplate) (
 	return
 }
 
-func GetHisPatientCaseHistoryById(hispatientid int64) (*models.HisPatientCaseHistory, error) {
+func GetHisPatientCaseHistoryById(id int64) (*models.HisPatientCaseHistory, error) {
 	history := models.HisPatientCaseHistory{}
-	err := XTReadDB().Model(&history).Where("his_patient_id = ? and status = 1", hispatientid).Find(&history).Error
+	err := XTReadDB().Model(&history).Where("id = ? and status = 1", id).Find(&history).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, err
@@ -261,6 +261,12 @@ func SaveHisPatientCaseHistory(caseHistory *models.HisPatientCaseHistory) error
 	return err
 }
 
+func UpdatePatientCaseHistory(id int64, his *models.HisPatientCaseHistory) error {
+
+	err := XTWriteDB().Model(&his).Where("id = ? and status  =1", id).Updates(map[string]interface{}{"temperature": his.Temperature, "blood_sugar": his.BloodSugar, "pulse": his.BloodSugar, "allergic_history": his.AllergicHistory, "diagnose": his.AllergicHistory, "sick": his.Sick, "remark": his.Remark, "doctor_advice": his.DoctorAdvice, "breathing": his.Breathing, "delivery_way": his.DeliveryWay, "diagnostic": his.Diagnostic, "family_history": his.FamilyHistory, "personal_history": his.PersonalHistory, "chief_conplaint": his.ChiefConplaint, "doctor": his.Doctor, "past_history": his.PastHistory, "history_of_present_illness": his.HistoryOfPresentIllness, "is_infect": his.IsInfect, "sick_date": his.SickDate, "symptom": his.Symptom, "sick_type": his.SickType, "blood_fat": his.BloodFat}).Error
+	return err
+}
+
 func SaveHisPrescription(prescription *models.HisPrescription) (err error) {
 	err = writeDb.Save(&prescription).Error
 	return

service/mobile_dialysis_service.go

@@ -1965,9 +1965,6 @@ func BatchDeleteMonitor(ids []string) (err error) {
 
 func GetPatientDialysisRecordList(patientid int64, startime int64, endtime int64) (order []*models.XtDialysisOrders, err error) {
 
-	//err = XTReadDB().Where("patient_id = ? and dialysis_date>=? and dialysis_date<=?  and status = 1", patientid, startime, endtime).Find(&order).Error
-	//return order, err
-
 	db := XTReadDB().Table("xt_dialysis_order as x").Where("x.status = 1")
 	table := XTReadDB().Table("xt_schedule as s")
 	fmt.Println(table)
@@ -1996,3 +1993,15 @@ func BatchDeleteAdvice(ids []int64) (err error) {
 	return
 
 }
+
+func UpdateAutoReduceDetail(good_id int64, count int64, record_time int64, patient_id int64) (models.AutomaticReduceDetail, error) {
+	detail := models.AutomaticReduceDetail{}
+	err := XTWriteDB().Model(&detail).Where("good_id = ? and status = 1 and record_time = ? and patient_id = ?", good_id, record_time, patient_id).Updates(map[string]interface{}{"count": count}).Error
+	return detail, err
+}
+
+func DeleteAutoReduceDetail(good_id int64, record_time int64, patient_id int64) error {
+	detail := models.AutomaticReduceDetail{}
+	err := XTWriteDB().Model(&detail).Where("good_id = ? and status = 1 and record_time = ? and patient_id = ?", good_id, record_time, patient_id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}