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

controllers/mobile_api_controllers/patient_api_controller.go

@@ -167,7 +167,7 @@ func (c *PatientApiController) EditDialysisSolution() {
 }
 
 func (c *PatientApiController) CreateDoctorAdvice() {
-	fmt.Println("进来了吗-----------------------------")
+
 	patient, _ := c.GetInt64("id", 0)
 	if patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -552,11 +552,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	//}
 
 	var advice models.DoctorAdvice
-	var tempAdvices []models.DoctorAdvice
 
 	if groupno > 0 {
-		advices, _ := service.FindAllDoctorAdviceByGoroupNoTwo(adminUserInfo.Org.Id, groupno)
-		tempAdvices = advices
+		advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 		for _, item := range advices {
 			if item.ExecutionState == 2 {
 				advice = item
@@ -564,9 +562,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		}
 	} else {
-		advices, _ := service.FindDoctorAdviceByIdsTwo(adminUserInfo.Org.Id, ids)
-		tempAdvices = advices
-
+		advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 		for _, item := range advices {
 			if item.ExecutionState == 2 {
 				advice = item
@@ -626,10 +622,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	if drugStockConfig.IsOpen == 1 {
 		if groupno > 0 {
-			//advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
 			isHasWay := false //用来判断是否包含来自药品库的医嘱
 			record_time := int64(0)
-			for _, item := range tempAdvices {
+			for _, item := range advices {
 				if item.Way == 1 {
 					isHasWay = true
 					record_time = item.RecordDate
@@ -666,7 +662,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if err != nil {
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					} else {
-						for _, item := range tempAdvices {
+						for _, item := range advices {
 							if item.Way == 1 {
 								if item.PrescribingNumber > 0 {
 									warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -711,7 +707,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 				} else if err == nil {
-					for _, item := range tempAdvices {
+					for _, item := range advices {
 						if item.Way == 1 {
 							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
 							if err == gorm.ErrRecordNotFound {
@@ -785,10 +781,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 			}
 		} else {
-			//advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
 			isHasWay := false //用来判断是否包含来自药品库的医嘱
 			record_time := int64(0)
-			for _, item := range tempAdvices {
+			for _, item := range advices {
 				if item.Way == 1 {
 					isHasWay = true
 					record_time = item.RecordDate
@@ -825,7 +821,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					if err != nil {
 						utils.TraceLog("创建出库单失败 err = %v", err)
 					} else {
-						for _, item := range tempAdvices {
+						for _, item := range advices {
 							if item.Way == 1 {
 								if item.PrescribingNumber > 0 {
 									warehouseOutInfo := &models.DrugWarehouseOutInfo{
@@ -870,7 +866,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 				} else if err == nil {
-					for _, item := range tempAdvices {
+					for _, item := range advices {
 						if item.Way == 1 {
 							outInfo, err := service.FindDrugStockOutInfoByTypeId(adminUserInfo.Org.Id, item.DrugId, out.ID, out.WarehouseOutOrderNumber)
 							if err == gorm.ErrRecordNotFound {
@@ -954,10 +950,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 	if privateDrugConfig != nil && privateDrugConfig.DrugStart == 1 {
 		if groupno > 0 {
-			//advices, _ := service.FindAllDoct/**/orAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
-			for _, item := range tempAdvices {
-				fmt.Println("------------进来没有22222222", item.ExecutionState)
-				if item.ExecutionState == 1 {
+			advices, _ := service.FindAllDoctorAdviceByGoroupNo(adminUserInfo.Org.Id, groupno)
+			for _, item := range advices {
+
+				if item.ExecutionState == 1 && item.Way == 2 {
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
 					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
 
@@ -991,9 +987,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			}
 		} else {
 
-			//advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
-			for _, item := range tempAdvices {
-				if item.ExecutionState == 1 {
+			advices, _ := service.FindDoctorAdviceByIds(adminUserInfo.Org.Id, ids)
+			for _, item := range advices {
+				if item.ExecutionState == 1 && item.Way == 2 {
 
 					prescribingNumber := strconv.FormatFloat(math.Abs(item.PrescribingNumber), 'f', 0, 64)
 					count, _ := strconv.ParseInt(prescribingNumber, 10, 64)
@@ -2076,9 +2072,14 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		internal_fistula_skin := dataBody["internal_fistula_skin"].(string)
 		evaluation.InternalFistulaSkin = internal_fistula_skin
 	}
+	if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "string" {
+		ishemorrhage, _ := dataBody["is_hemorrhage"].(string)
+		is_hemorrhage, _ := strconv.ParseInt(ishemorrhage, 10, 64)
+		evaluation.IsHemorrhage = is_hemorrhage
 
-	if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "float64" {
-		is_hemorrhage := int64(dataBody["is_hemorrhage"].(float64))
+		//if dataBody["is_hemorrhage"] != nil && reflect.TypeOf(dataBody["is_hemorrhage"]).String() == "float64" {
+		//	is_hemorrhage := int64(dataBody["is_hemorrhage"].(float64))
+		//	fmt.Println("is_hemorrhage2222222222222222",is_hemorrhage)
 		if is_hemorrhage != 1 && is_hemorrhage != 2 {
 			is_hemorrhage = 0
 		}
@@ -2220,6 +2221,11 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 		evaluation.Edema = edema
 	}
 
+	if dataBody["special_treatment"] != nil && reflect.TypeOf(dataBody["special_treatment"]).String() == "string" {
+		specialTreatment := dataBody["special_treatment"].(string)
+		evaluation.SpecialTreatment = specialTreatment
+	}
+
 	return
 }