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

conf/app.conf

 appname = 血透
 httpport = 9531
-runmode = prod
+runmode = dev
 #dev/prod
 
 #

controllers/inspection_api_controller.go

 	}
 	inspMap := make(map[string]models.Inspection)
 	for _, item := range insp {
-		fmt.Println(item.ID)
 		a := strconv.FormatInt(item.ProjectId, 10) + "-" + strconv.FormatInt(item.ItemId, 10)
 		inspMap[a] = item
 	}
 	addinsp := make([]models.Inspection, 0)
 	editinsp := make([]models.Inspection, 0)
 	noMap := make([]int64, 0)
-	fmt.Println(from.FormItem)
+
+	fmt.Println("00000000000000000000000000000000000000000000000000000")
 
 	for _, item := range from.FormItem {
-		fmt.Println(item.ID)
+		fmt.Println("name:", item.ItemId, "value:", item.Value)
 
 		ref, _ := service.GetInspectionReferenceById(item.ItemId)
 		//if item.ID == 0 {
 		fmt.Println(inspMap)
 
 		inspection := inspMap[a]
+		inspection.ID = item.ID
+		inspection.OrgId = adminUserInfo.CurrentOrgId
+		inspection.PatientId = patient
+		inspection.ProjectId = from.ProjectId
+		inspection.ItemId = item.ItemId
+		inspection.ItemName = item.ItemName
+		inspection.ProjectName = item.ProjectName
+		inspection.InspectType = item.RangeType
+		inspection.InspectValue = item.Value
+		inspection.InspectDate = date
+		inspection.Status = 1
 		inspection.InspectValue = item.Value
 		inspection.InspectDate = date
 		inspection.UpdatedTime = time.Now().Unix()

controllers/mobile_api_controllers/dialysis_api_controller.go

 
 		}
 
+		recordDialysis, _ := service.GetSigleAssessmentAfterDislysisRecord(assessmentAfterDislysis.PatientId, assessmentAfter.AssessmentDate, assessmentAfter.UserOrgId)
+
+		if assessmentAfterDislysis.WeightAfter == 0 {
+			assessmentAfterDislysis.WeightAfter = recordDialysis.WeightAfter
+		}
+
 		err := service.AddSigleAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 
 		//记录日志
 
 		assessmentAfterDislysis.CreatedTime = assessmentAfter.CreatedTime
 		assessmentAfterDislysis.ID = assessmentAfter.ID
+		recordDialysis, _ := service.GetSigleAssessmentAfterDislysisRecord(assessmentAfterDislysis.PatientId, assessmentAfter.AssessmentDate, assessmentAfter.UserOrgId)
 
+		if assessmentAfterDislysis.WeightAfter == 0 {
+			assessmentAfterDislysis.WeightAfter = recordDialysis.WeightAfter
+		}
 		err := service.UpdateAssessmentAfterDislysisRecord(&assessmentAfterDislysis)
 
 		//记录日志
 		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
 	}
 
+	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10598 {
+		tempassessmentAfterDislysis.SystolicBloodPressure = 0
+		tempassessmentAfterDislysis.DiastolicBloodPressure = 0
+	}
+
 	if lastAssessmentAfterDislysis != nil {
 		tempassessmentAfterDislysis.BloodPressureType = lastAssessmentAfterDislysis.BloodPressureType
 
 			tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
 		}
 
+		if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10598 {
+			tempassessmentAfterDislysis.SystolicBloodPressure = 0
+			tempassessmentAfterDislysis.DiastolicBloodPressure = 0
+		}
+
 	}
 
 	finish := models.XtDialysisFinish{
 		dialysisOrder.FinishModifier = adminUserInfo.AdminUser.Id
 		dialysisOrder.EndTime = endDate.Unix()
 
-		fmt.Println("ADMINWOOWOWOWOWO", adminUserInfo.Org.Id)
-
 		// 长沙南雅需求
 		if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9675 {
 
 
 			// 查询未执行的医嘱
 			doctorAdvice, _ := service.GetDoctorAdviceListNoExecution(dialysisOrder.PatientId, dialysisOrder.DialysisDate, dialysisOrder.UserOrgId)
-			fmt.Println("doctorAdviceWOWOOWOWOWOWOWOW", doctorAdvice)
+
 			for _, item := range doctorAdvice {
 				service.UpdateDoctorAdviceNoExecution(item.ID, dialysisOrder.FinishNurse, dialysisOrder.EndTime)
 				key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(item.PatientId, 10) + ":" + strconv.FormatInt(item.AdviceDate, 10) + ":doctor_advices"
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}
 
-			if adminUserInfo.Org.Id == 10612 {
+			if adminUserInfo.Org.Id == 10612 || adminUserInfo.Org.Id == 10617 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
 				ultrafiltration_rate = ultrafiltration_rate / 1000
 			}

controllers/patient_dataconfig_api_controller.go

 
 	beego.Router("/api/patient/getpatientmedicallist", &PatientDataConfigAPIController{}, "Get:GetPatientMedicalList")
 
+	//评估工具的接口
+	beego.Router("/api/patient/fallassement/getallnurselist", &PatientDataConfigAPIController{}, "Get:GetAllNurseList")
+
+	beego.Router("/api/patient/fallassment/savefllassessmentlist", &PatientDataConfigAPIController{}, "Post:SaveFllassessmentList")
+
 }
 
 type PatientDataConfigAPIController struct {
 		"list": list,
 	})
 }
+
+func (this *PatientDataConfigAPIController) GetAllNurseList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
+	nurseList, _ := service.GetAllNurseList(orgId, appId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"nurseList": nurseList,
+	})
+}
+
+func (this *PatientDataConfigAPIController) SaveFllassessmentList() {
+
+	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
+	}
+}

service/dialysis_service.go

 	return errors
 }
 
+func GetSigleAssessmentAfterDislysisRecord(patient_id int64, assesment_date int64, user_org_id int64) (models.AssessmentAfterDislysis, error) {
+
+	afterDislysis := models.AssessmentAfterDislysis{}
+
+	err := XTReadDB().Where("patient_id=? and assessment_date = ? and user_org_id = ? and status=1", patient_id, assesment_date, user_org_id).Find(&afterDislysis).Error
+	return afterDislysis, err
+}
+
 func AddSigleAssessmentBeforeDislysisRecord(assessmentBeforeDislysis *models.PredialysisEvaluation) (err error) {
 	tx := writeDb.Begin()
 	errors := tx.Model(&models.PredialysisEvaluation{}).Create(&assessmentBeforeDislysis).Error

service/inspection_service.go

 import (
 	"XT_New/models"
 	"errors"
+	"fmt"
 	"strings"
 	"time"
 )
 
 	if len(edit) > 0 {
 		for _, item := range edit {
+			fmt.Println("o----------------------", item.ItemId)
+			fmt.Println("value----------------------", item.InspectValue)
 			err = tx.Save(&item).Error
 			if err != nil {
 				tx.Rollback()

service/self_drug_service.go

 
 func GetNewDrugFlowOutWarehouseInfo(drug_id int64, user_org_id int64, start_time int64) (list []*models.DrugFlowTwenty, err error) {
 
-	db := XTReadDB().Model(&list).Where("status=1 and consumable_type=3")
+	db := XTReadDB().Model(&list).Where("status=1 and (consumable_type=3 or consumable_type=2)")
 
 	if drug_id > 0 {
 		db = db.Where("drug_id = ?", drug_id)