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

controllers/dialysis_api_controller.go

@@ -244,8 +244,8 @@ func (c *DialysisApiController) PostPrescription() {
 	//fmt.Println("下机前推注鱼精蛋白",push_the_protamine)
 	// var prescription_doctor int64
 	blood := c.GetString("blood")
-	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
-	dialysis_irrigation := c.GetString("dialysis_irrigation")
+	//dialysis_dialyszers := c.GetString("dialysis_dialyszers")
+	//dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
@@ -326,9 +326,9 @@ func (c *DialysisApiController) PostPrescription() {
 		AnticoagulantStopTimeHour:  anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:   anticoagulant_stop_time_min,
 		Blood:                      blood,
-		DialysisDialyszers:         dialysis_dialyszers,
-		DialysisIrrigation:         dialysis_irrigation,
-		AntioxidantCommodityName:   antioxidant_commodity_name,
+		//DialysisDialyszers:         dialysis_dialyszers,
+		//DialysisIrrigation:         dialysis_irrigation,
+		AntioxidantCommodityName: antioxidant_commodity_name,
 	}
 
 	if appRole.UserType == 2 || appRole.UserType == 1 {
@@ -495,8 +495,8 @@ func (c *DialysisApiController) PostSoulution() {
 	anticoagulant_stop_time_hour, _ := c.GetInt64("anticoagulant_stop_time_hour", 0)
 	anticoagulant_stop_time_min, _ := c.GetInt64("anticoagulant_stop_time_min", 0)
 	blood := c.GetString("blood")
-	dialysis_dialyszers := c.GetString("dialysis_dialyszers")
-	dialysis_irrigation := c.GetString("dialysis_irrigation")
+	//dialysis_dialyszers := c.GetString("dialysis_dialyszers")
+	//dialysis_irrigation := c.GetString("dialysis_irrigation")
 	antioxidant_commodity_name := c.GetString("antioxidant_commodity_name")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -588,9 +588,9 @@ func (c *DialysisApiController) PostSoulution() {
 		AnticoagulantStopTimeHour: anticoagulant_stop_time_hour,
 		AnticoagulantStopTimeMin:  anticoagulant_stop_time_min,
 		Blood:                     blood,
-		DialysisIrrigation:        dialysis_irrigation,
-		DialysisDialyszers:        dialysis_dialyszers,
-		AntioxidantCommodityName:  antioxidant_commodity_name,
+		//DialysisIrrigation:        dialysis_irrigation,
+		//DialysisDialyszers:        dialysis_dialyszers,
+		AntioxidantCommodityName: antioxidant_commodity_name,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(patient, recordDate.Unix(), adminUserInfo.CurrentOrgId)
@@ -1280,7 +1280,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-			if templateInfo.TemplateId == 17 && templateInfo.TemplateId == 22 && templateInfo.TemplateId == 21 {
+			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 {
 				dewater_amount = dewater_amount * 1000
 			}
 			if dewater_amount <= 0 {

controllers/his_api_controller.go

@@ -955,7 +955,7 @@ func (c *HisApiController) CreateHisPatientCaseHistory() {
 	doctor_advice := c.GetString("doctor_advice")
 	remark := c.GetString("remark")
 	breathingfloat, _ := strconv.ParseFloat(breathing, 64)
-	fmt.Println("breathingfloat", breathingfloat)
+	//fmt.Println("breathingfloat", breathingfloat)
 	sick, _ := c.GetInt64("sick")
 	diagnose, _ := c.GetInt64("diagnose")
 	timeLayout := "2006-01-02"

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 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 {
 			dewater_amount = dewater_amount * 1000
 
 		}

controllers/schedule_api_controller.go

@@ -548,14 +548,32 @@ func (c *ScheduleApiController) ChangeSchedule() {
 
 	schedule.UpdatedTime = time.Now().Unix()
 	err = service.UpdateSchedule(schedule)
-	if err != nil {
-		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeChangeScheduleFail)
-		return
+
+	prescription := models.DialysisPrescription{
+		ModeId: schedule.ModeId,
+	}
+	_, errcode := service.GetDialysisPrescribe(schedule.UserOrgId, schedule.PatientId, schedule.ScheduleDate)
+	if errcode == gorm.ErrRecordNotFound {
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeChangeScheduleFail)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":      "ok",
+			"schedule": &schedule,
+		})
+	} else if errcode == nil {
+		err = service.UpdatedDialysisPrescription(&prescription, schedule.ScheduleDate, schedule.PatientId, schedule.UserOrgId)
+
+		if err != nil {
+			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeChangeScheduleFail)
+			return
+		}
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg":      "ok",
+			"schedule": &schedule,
+		})
 	}
-	c.ServeSuccessJSON(map[string]interface{}{
-		"msg":      "ok",
-		"schedule": &schedule,
-	})
 }
 
 // /api/schedule/print/initdata [get]

controllers/stock_api_controller.go

@@ -288,18 +288,20 @@ func (c *StockApiController) ModifyManufacturer() {
 		PinYin:           pinyin,
 	}
 
-	_, errcode := service.GetManufacturerName(adminUserInfo.CurrentOrgId, manufacturer_name)
-	if errcode == gorm.ErrRecordNotFound {
-		err := service.ModifyManufacturer(&manufacturer)
+	Manufacturer, _ := service.GetManufacturerName(adminUserInfo.CurrentOrgId, manufacturer_name)
 
-		if err == nil {
-			c.ServeSuccessJSON(map[string]interface{}{
-				"manufacturer": manufacturer,
-			})
-		} else {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
-		}
-	} else if errcode == nil {
+	if Manufacturer.ID > 0 && Manufacturer.ID != manufacturer.ID {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeIdCardNoExist)
+		return
+	}
+
+	err := service.ModifyManufacturer(&manufacturer)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"manufacturer": manufacturer,
+		})
+	} else {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 

service/schedule_service.go

@@ -713,3 +713,9 @@ func GetThreeWeekList(startime int64, endtime int64, orgid int64, scheduletype i
 
 	return schedule, err
 }
+
+func UpdatedDialysisPrescription(prescription *models.DialysisPrescription, recordDate int64, patientid int64, orgid int64) error {
+
+	err := XTWriteDB().Model(&prescription).Where("record_date = ? and patient_id = ? and user_org_id = ?", recordDate, patientid, orgid).Update(map[string]interface{}{"mode_id": prescription.ModeId, "updated_time": time.Now().Unix()}).Error
+	return err
+}