耗材参数

conf/app.conf

@@ -1,6 +1,6 @@
 appname = 血透
-httpport = 9531
-runmode = prod
+httpport = 9529
+runmode = dev
 
 #
 copyrequestbody = true

controllers/manage_api_controller.go

@@ -1406,7 +1406,9 @@ func (this *MachineApiController) SaveBacteria() {
 
 	detectionResult := dataBody["detection_result"].(string)
 	sort := dataBody["sort"].(string)
-	pass_examination := int64(dataBody["pass_examination"].(float64))
+
+	examination := dataBody["pass_examination"].(string)
+	pass_examination, err := strconv.ParseInt(examination, 10, 64)
 	modifications := int64(dataBody["modifications"].(float64))
 	culture := models.DeviceCulture{
 		BedId:             addmacher.BedId,
@@ -1475,9 +1477,10 @@ func (this *MachineApiController) SaveLinconmycin() {
 	detectionResult := dataBody["detection_resultb"].(string)
 
 	sort := dataBody["sort"].(string)
-	pass_examination := int64(dataBody["pass_examination"].(float64))
-	modifications := int64(dataBody["modifications"].(float64))
 
+	modifications := int64(dataBody["modifications"].(float64))
+	examination := dataBody["pass_examination"].(string)
+	pass_examination, _ := strconv.ParseInt(examination, 10, 64)
 	dialysate := models.DeviceDialysate{
 		SamplingDate:      samp_date,
 		Specimenb:         specimen,
@@ -1559,8 +1562,11 @@ func (this *MachineApiController) SaveQualityControl() {
 	detectionUnit := dataBody["detection_unit"].(string)
 
 	sort := dataBody["sort"].(string)
-	pass_examination := int64(dataBody["pass_examination"].(float64))
+
 	modifications := int64(dataBody["modifications"].(float64))
+	examination := dataBody["pass_examination"].(string)
+	pass_examination, _ := strconv.ParseInt(examination, 10, 64)
+
 	ion := models.DeviceIon{
 		SamplingDate:    dateB,
 		Samplerc:        samplerc,
@@ -1645,34 +1651,37 @@ func (this *MachineApiController) EditCulture() {
 func (this *MachineApiController) UpdateCulture() {
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
-	//fmt.Println("err", err)
+
 	id := int64(dataBody["id"].(float64))
-	//fmt.Println("id", id)
+
 	date := dataBody["date"].(string)
-	//fmt.Println("取样日期", date)
+
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
 	theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", date+" 00:00:00", loc)
 	state_date := theTime.Unix()
-	//fmt.Println("取样日期", state_date)
+
 	specimen := int64(dataBody["specimen"].(float64))
-	//fmt.Println("取样标本", specimen)
+
 	cona := dataBody["concentrate_noa"].(string)
-	//fmt.Println("A浓缩液批号", cona)
+
 	conb := dataBody["concentrate_nob"].(string)
-	//fmt.Println("B浓批号", conb)
+
 	samplingLoactiona := int64(dataBody["sampling_locationa"].(float64))
-	//fmt.Println("采样部位", samplingLoactiona)
+
 	detectionUnit := dataBody["detection_unit"].(string)
-	//fmt.Println("检测单位", detectionUnit)
+
 	sampler := int64(dataBody["sampler"].(float64))
-	//fmt.Println("取样者", sampler)
+
 	reportDate := dataBody["reporting_date"].(string)
 	reportTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", reportDate+" 00:00:00", loc)
 	repDate := reportTime.Unix()
-	//fmt.Println("出报告日期", repDate)
+
 	detectionResult := dataBody["detection_result"].(string)
-	//fmt.Println("检测结果", detectionResult)
+
+	sort := dataBody["sort"].(string)
+	pass_examination := int64(dataBody["pass_examination"].(float64))
+	modifications := int64(dataBody["modifications"].(float64))
 	adminUser := this.GetAdminUserInfo()
 	orgId := adminUser.CurrentOrgId
 	culture := models.DeviceCulture{
@@ -1685,6 +1694,9 @@ func (this *MachineApiController) UpdateCulture() {
 		Sampler:           sampler,
 		ReportingDate:     repDate,
 		DetectionResult:   detectionResult,
+		Sort:              sort,
+		PassExamination:   pass_examination,
+		Modifications:     modifications,
 	}
 	err = service.UpdateCulture(id, orgId, &culture)
 	if err != nil {
@@ -1779,6 +1791,10 @@ func (this *MachineApiController) Updatedialystate() {
 	fmt.Println("检测结果", detectionResultb)
 	detectionUnit := dataBody["detection_unit"].(string)
 	fmt.Println("检测单位", detectionUnit)
+
+	sort := dataBody["sort"].(string)
+	pass_examination := int64(dataBody["pass_examination"].(float64))
+	modifications := int64(dataBody["modifications"].(float64))
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
 	dialysate := models.DeviceDialysate{
@@ -1791,6 +1807,9 @@ func (this *MachineApiController) Updatedialystate() {
 		Samplerb:          samplerb,
 		ReportingDateb:    report_date,
 		DetectionResultb:  detectionResultb,
+		Sort:              sort,
+		PassExamination:   pass_examination,
+		Modifications:     modifications,
 	}
 	err = service.Updatedialystate(id, orgid, &dialysate)
 	if err != nil {
@@ -1863,53 +1882,59 @@ func (this *MachineApiController) UpdateIon() {
 	dateb := dataBody["dateb"].(string)
 	inLocation, _ := time.ParseInLocation(timeLayout+" 15:04:05", dateb+" 00:00:00", loc)
 	dateB := inLocation.Unix()
-	fmt.Println("取样日期", dateB)
+
 	samplerc := int64(dataBody["samplerc"].(float64))
-	fmt.Println("取样者", samplerc)
+
 	concentratenof := dataBody["concentrate_nof"].(string)
-	fmt.Println("浓A", concentratenof)
+
 	concentrateonog := dataBody["concentrate_nog"].(string)
-	fmt.Println("浓B", concentrateonog)
+
 	dateReportc := dataBody["date_reportc"].(string)
 	parseInLocation, _ := time.ParseInLocation(timeLayout+" 15:04:05", dateReportc+" 00:00:00", loc)
 	datec := parseInLocation.Unix()
-	fmt.Println("报告日期", datec)
+
 	actualNa := dataBody["actual_na"].(string)
-	fmt.Println("钠", actualNa)
+
 	actualPna := dataBody["actual_pna"].(string)
-	fmt.Println("配钠", actualPna)
+
 	actualK := dataBody["actual_k"].(string)
-	fmt.Println("钾", actualK)
+
 	actualCa := dataBody["actual_ca"].(string)
-	fmt.Println("钙", actualCa)
+
 	actualCi := dataBody["actual_ci"].(string)
-	fmt.Println("氯", actualCi)
+
 	actualHco := dataBody["actual_hco"].(string)
-	fmt.Println("HCO", actualHco)
+
 	actualMg := dataBody["actual_mg"].(string)
-	fmt.Println("actualMg", actualMg)
+
 	actulaPH := dataBody["actual_ph"].(string)
-	fmt.Println("PH", actulaPH)
+
 	remakes := dataBody["remakes"].(string)
-	fmt.Println("备注", remakes)
+
 	detectionUnit := dataBody["detection_unit"].(string)
-	fmt.Println("检测单位", detectionUnit)
+
+	sort := dataBody["sort"].(string)
+	pass_examination := int64(dataBody["pass_examination"].(float64))
+	modifications := int64(dataBody["modifications"].(float64))
 	ion := models.DeviceIon{
-		SamplingDate:   dateB,
-		Samplerc:       samplerc,
-		DetectionUnit:  detectionUnit,
-		ConcentrateNof: concentratenof,
-		ConcentrateNog: concentrateonog,
-		DateReportc:    datec,
-		ActualNa:       actualNa,
-		ActualPna:      actualPna,
-		ActualK:        actualK,
-		ActualCa:       actualCa,
-		ActualCi:       actualCi,
-		ActualHco:      actualHco,
-		ActualMg:       actualMg,
-		ActualPh:       actulaPH,
-		Remakes:        remakes,
+		SamplingDate:    dateB,
+		Samplerc:        samplerc,
+		DetectionUnit:   detectionUnit,
+		ConcentrateNof:  concentratenof,
+		ConcentrateNog:  concentrateonog,
+		DateReportc:     datec,
+		ActualNa:        actualNa,
+		ActualPna:       actualPna,
+		ActualK:         actualK,
+		ActualCa:        actualCa,
+		ActualCi:        actualCi,
+		ActualHco:       actualHco,
+		ActualMg:        actualMg,
+		ActualPh:        actulaPH,
+		Remakes:         remakes,
+		Sort:            sort,
+		PassExamination: pass_examination,
+		Modifications:   modifications,
 	}
 	adminUser := this.GetAdminUserInfo()
 	orgId := adminUser.CurrentOrgId
@@ -3226,9 +3251,10 @@ func (this *MachineApiController) SaveOxygenates() {
 	detectionResult := dataBody["detection_resultb"].(string)
 
 	sort := dataBody["sort"].(string)
-	pass_examination := int64(dataBody["pass_examination"].(float64))
-	modifications := int64(dataBody["modifications"].(float64))
 
+	modifications := int64(dataBody["modifications"].(float64))
+	examination := dataBody["pass_examination"].(string)
+	pass_examination, _ := strconv.ParseInt(examination, 10, 64)
 	oxygenates := models.XtDeviceOxygenates{
 		SamplingDate:      samp_date,
 		Specimenb:         specimen,
@@ -3295,9 +3321,10 @@ func (this *MachineApiController) SaveHardWater() {
 	detectionResult := dataBody["detection_resultb"].(string)
 
 	sort := dataBody["sort"].(string)
-	pass_examination := int64(dataBody["pass_examination"].(float64))
-	modifications := int64(dataBody["modifications"].(float64))
 
+	modifications := int64(dataBody["modifications"].(float64))
+	examination := dataBody["pass_examination"].(string)
+	pass_examination, _ := strconv.ParseInt(examination, 10, 64)
 	hadwater := models.XtDeviceHadwater{
 		SamplingDate:      samp_date,
 		Specimenb:         specimen,
@@ -3365,9 +3392,10 @@ func (this *MachineApiController) SaveWater() {
 	detectionResult := dataBody["detection_resultb"].(string)
 
 	sort := dataBody["sort"].(string)
-	pass_examination := int64(dataBody["pass_examination"].(float64))
-	modifications := int64(dataBody["modifications"].(float64))
 
+	modifications := int64(dataBody["modifications"].(float64))
+	examination := dataBody["pass_examination"].(string)
+	pass_examination, _ := strconv.ParseInt(examination, 10, 64)
 	deviceWater := models.XtDeviceWater{
 		SamplingDate:      samp_date,
 		Specimenb:         specimen,
@@ -3434,9 +3462,10 @@ func (this *MachineApiController) SaveDevicePH() {
 	detectionResult := dataBody["detection_resultb"].(string)
 
 	sort := dataBody["sort"].(string)
-	pass_examination := int64(dataBody["pass_examination"].(float64))
-	modifications := int64(dataBody["modifications"].(float64))
 
+	modifications := int64(dataBody["modifications"].(float64))
+	examination := dataBody["pass_examination"].(string)
+	pass_examination, _ := strconv.ParseInt(examination, 10, 64)
 	devicePh := models.XtDevicePh{
 		SamplingDate:      samp_date,
 		Specimenb:         specimen,
@@ -3512,6 +3541,9 @@ func (this *MachineApiController) UpdateOxygenates() {
 
 	detectionUnit := dataBody["detection_unit"].(string)
 
+	sort := dataBody["sort"].(string)
+	pass_examination := int64(dataBody["pass_examination"].(float64))
+	modifications := int64(dataBody["modifications"].(float64))
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	oxygenates := models.XtDeviceOxygenates{
@@ -3524,6 +3556,9 @@ func (this *MachineApiController) UpdateOxygenates() {
 		Samplerb:          samplerb,
 		ReportingDateb:    report_date,
 		DetectionResultb:  detectionResultb,
+		Sort:              sort,
+		PassExamination:   pass_examination,
+		Modifications:     modifications,
 	}
 
 	err = service.UpdateOxygenates(id, orgId, &oxygenates)
@@ -3906,6 +3941,9 @@ func (this *MachineApiController) UpdateHadWater() {
 
 	detectionUnit := dataBody["detection_unit"].(string)
 
+	sort := dataBody["sort"].(string)
+	pass_examination := int64(dataBody["pass_examination"].(float64))
+	modifications := int64(dataBody["modifications"].(float64))
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	hadWater := models.XtDeviceHadwater{
@@ -3918,6 +3956,9 @@ func (this *MachineApiController) UpdateHadWater() {
 		Samplerb:          samplerb,
 		ReportingDateb:    report_date,
 		DetectionResultb:  detectionResultb,
+		Sort:              sort,
+		PassExamination:   pass_examination,
+		Modifications:     modifications,
 	}
 	err = service.UpdateHadWater(id, orgId, &hadWater)
 	if err != nil {
@@ -3959,7 +4000,9 @@ func (this *MachineApiController) UpdateWater() {
 	detectionResultb := dataBody["detection_resultb"].(string)
 
 	detectionUnit := dataBody["detection_unit"].(string)
-
+	sort := dataBody["sort"].(string)
+	pass_examination := int64(dataBody["pass_examination"].(float64))
+	modifications := int64(dataBody["modifications"].(float64))
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	hadWater := models.XtDeviceWater{
@@ -3972,6 +4015,9 @@ func (this *MachineApiController) UpdateWater() {
 		Samplerb:          samplerb,
 		ReportingDateb:    report_date,
 		DetectionResultb:  detectionResultb,
+		Sort:              sort,
+		PassExamination:   pass_examination,
+		Modifications:     modifications,
 	}
 	err = service.UpdateDeviceWater(id, orgId, &hadWater)
 	if err != nil {
@@ -4014,6 +4060,9 @@ func (this *MachineApiController) UpdateDevicePh() {
 
 	detectionUnit := dataBody["detection_unit"].(string)
 
+	sort := dataBody["sort"].(string)
+	pass_examination := int64(dataBody["pass_examination"].(float64))
+	modifications := int64(dataBody["modifications"].(float64))
 	adminUserInfo := this.GetAdminUserInfo()
 	orgId := adminUserInfo.CurrentOrgId
 	hadWater := models.XtDevicePh{
@@ -4026,6 +4075,9 @@ func (this *MachineApiController) UpdateDevicePh() {
 		Samplerb:          samplerb,
 		ReportingDateb:    report_date,
 		DetectionResultb:  detectionResultb,
+		Sort:              sort,
+		PassExamination:   pass_examination,
+		Modifications:     modifications,
 	}
 	err = service.UpdateDivicePh(id, orgId, &hadWater)
 	if err != nil {

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1644,15 +1644,15 @@ func (this *DialysisAPIController) StartDialysis() {
 	}
 
 	nurse, getNurseErr = service.GetAdminUserByUserID(puncture_nurse)
-	if getNurseErr != nil {
-		this.ErrorLog("获取护士失败:%v", getNurseErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if nurse == nil {
-		this.ErrorLog("护士不存在")
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	//if getNurseErr != nil {
+	//	this.ErrorLog("获取护士失败:%v", getNurseErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if nurse == nil {
+	//	this.ErrorLog("护士不存在")
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 
 	deviceNumber, getDeviceNumberErr := service.GetDeviceNumberByID(adminUserInfo.Org.Id, bedID)
 	if getDeviceNumberErr != nil {
@@ -2363,15 +2363,15 @@ func (this *DialysisAPIController) ModifyStartDialysisOrder() {
 	}
 
 	nurse, getNurseErr = service.GetAdminUserByUserID(puncture_nurse)
-	if getNurseErr != nil {
-		this.ErrorLog("获取护士失败:%v", getNurseErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-		return
-	} else if nurse == nil {
-		this.ErrorLog("护士不存在")
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-		return
-	}
+	//if getNurseErr != nil {
+	//	this.ErrorLog("获取护士失败:%v", getNurseErr)
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//	return
+	//} else if nurse == nil {
+	//	this.ErrorLog("护士不存在")
+	//	this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+	//	return
+	//}
 
 	deviceNumber, getDeviceNumberErr := service.GetDeviceNumberByID(adminUserInfo.Org.Id, bedID)
 	if getDeviceNumberErr != nil {

models/device_models.go

@@ -584,6 +584,9 @@ type DeviceCultures struct {
 	EquitmentId       int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	UserName          string `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	Bed               string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort              string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination   int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
 //细菌培养检测
@@ -634,6 +637,9 @@ type DeviceDialysates struct {
 	EquitmentId       int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
 	UserName          string `gorm:"column:user_name" json:"user_name" form:"user_name"`
 	Bed               string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort              string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination   int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications     int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
 //内霉素检测
@@ -666,30 +672,33 @@ func (DeviceDialysate) TableName() string {
 }
 
 type DeviceIons struct {
-	ID             int64  `gorm:"column:id" json:"id" form:"id"`
-	SamplingDate   int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
-	Samplerc       int64  `gorm:"column:samplerc" json:"samplerc" form:"samplerc"`
-	DetectionUnit  string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
-	ConcentrateNof string `gorm:"column:concentrate_nof" json:"concentrate_nof" form:"concentrate_nof"`
-	ConcentrateNog string `gorm:"column:concentrate_nog" json:"concentrate_nog" form:"concentrate_nog"`
-	DateReportc    int64  `gorm:"column:date_reportc" json:"date_reportc" form:"date_reportc"`
-	ActualNa       string `gorm:"column:actual_na" json:"actual_na" form:"actual_na"`
-	ActualPna      string `gorm:"column:actual_pna" json:"actual_pna" form:"actual_pna"`
-	ActualK        string `gorm:"column:actual_k" json:"actual_k" form:"actual_k"`
-	ActualCa       string `gorm:"column:actual_ca" json:"actual_ca" form:"actual_ca"`
-	ActualCi       string `gorm:"column:actual_ci" json:"actual_ci" form:"actual_ci"`
-	ActualHco      string `gorm:"column:actual_hco" json:"actual_hco" form:"actual_hco"`
-	ActualMg       string `gorm:"column:actual_mg" json:"actual_mg" form:"actual_mg"`
-	ActualPh       string `gorm:"column:actual_ph" json:"actual_ph" form:"actual_ph"`
-	Remakes        string `gorm:"column:remakes" json:"remakes" form:"remakes"`
-	Status         int64  `gorm:"column:status" json:"status" form:"status"`
-	UserOrgId      int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	Ctime          int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime          int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	BedId          int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
-	EquitmentId    int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
-	UserName       string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	Bed            string `gorm:"column:bed" json:"bed" form:"bed"`
+	ID              int64  `gorm:"column:id" json:"id" form:"id"`
+	SamplingDate    int64  `gorm:"column:sampling_date" json:"sampling_date" form:"sampling_date"`
+	Samplerc        int64  `gorm:"column:samplerc" json:"samplerc" form:"samplerc"`
+	DetectionUnit   string `gorm:"column:detection_unit" json:"detection_unit" form:"detection_unit"`
+	ConcentrateNof  string `gorm:"column:concentrate_nof" json:"concentrate_nof" form:"concentrate_nof"`
+	ConcentrateNog  string `gorm:"column:concentrate_nog" json:"concentrate_nog" form:"concentrate_nog"`
+	DateReportc     int64  `gorm:"column:date_reportc" json:"date_reportc" form:"date_reportc"`
+	ActualNa        string `gorm:"column:actual_na" json:"actual_na" form:"actual_na"`
+	ActualPna       string `gorm:"column:actual_pna" json:"actual_pna" form:"actual_pna"`
+	ActualK         string `gorm:"column:actual_k" json:"actual_k" form:"actual_k"`
+	ActualCa        string `gorm:"column:actual_ca" json:"actual_ca" form:"actual_ca"`
+	ActualCi        string `gorm:"column:actual_ci" json:"actual_ci" form:"actual_ci"`
+	ActualHco       string `gorm:"column:actual_hco" json:"actual_hco" form:"actual_hco"`
+	ActualMg        string `gorm:"column:actual_mg" json:"actual_mg" form:"actual_mg"`
+	ActualPh        string `gorm:"column:actual_ph" json:"actual_ph" form:"actual_ph"`
+	Remakes         string `gorm:"column:remakes" json:"remakes" form:"remakes"`
+	Status          int64  `gorm:"column:status" json:"status" form:"status"`
+	UserOrgId       int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime           int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime           int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	BedId           int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
+	EquitmentId     int64  `gorm:"column:equitment_id" json:"equitment_id" form:"equitment_id"`
+	UserName        string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Bed             string `gorm:"column:bed" json:"bed" form:"bed"`
+	Sort            string `gorm:"column:sort" json:"sort" form:"sort"`
+	PassExamination int64  `gorm:"column:pass_examination" json:"pass_examination" form:"pass_examination"`
+	Modifications   int64  `gorm:"column:modifications" json:"modifications" form:"modifications"`
 }
 
 //透析液离子浓度检测

service/inspection_service.go

@@ -139,7 +139,7 @@ func GetPatientInspections(orgId, patientId, projectId, page int64) (inspections
 	}
 
 	var Id models.InspectionDate
-	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("inspect_date").Group("inspect_date").Order("inspect_date desc").Offset(page - 1).Limit(1).Scan(&Id).Error
+	err = readDb.Model(&models.Inspection{}).Where("patient_id=? and org_id=? and project_id=? and status=1", patientId, orgId, projectId).Select("inspect_date").Group("inspect_date").Order("created_time desc").Offset(page - 1).Limit(1).Scan(&Id).Error
 	if err != nil {
 		return
 	}

service/manage_service.go

@@ -448,7 +448,7 @@ func GetAllCulture(orgId int64) (cultures []*models.DeviceCultures, err error) {
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.speling_date,x.specimen,x.concentrate_noa,x.concentrate_nob,x.sampling_locationa,x.detection_unit,x.sampler,x.reporting_date,x.detection_result,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sampler").Scan(&cultures).Error
+	err = db.Group("x.id").Select("x.id,x.speling_date,x.specimen,x.concentrate_noa,x.concentrate_nob,x.sampling_locationa,x.detection_unit,x.sampler,x.reporting_date,x.detection_result,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sampler").Scan(&cultures).Error
 	return cultures, err
 }
 
@@ -459,7 +459,7 @@ func GetAllDialysate(orgId int64) (dialysate []*models.DeviceDialysates, err err
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
 
 	return dialysate, err
 }
@@ -471,7 +471,7 @@ func GetAllDeviceIon(orgId int64) (ions []*models.DeviceIons, err error) {
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.sampling_date,x.samplerc,x.detection_unit,x.concentrate_nof,x.concentrate_nog,x.date_reportc,x.actual_na,x.actual_pna,x.actual_k,x.actual_ca,x.actual_ci,x.actual_hco,x.actual_mg,x.actual_ph,x.remakes,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerc").Scan(&ions).Error
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.samplerc,x.detection_unit,x.concentrate_nof,x.concentrate_nog,x.date_reportc,x.actual_na,x.actual_pna,x.actual_k,x.actual_ca,x.actual_ci,x.actual_hco,x.actual_mg,x.actual_ph,x.remakes,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerc").Scan(&ions).Error
 	return ions, err
 }
 
@@ -489,7 +489,7 @@ func GetSampler(id int64) (models.App_Role, error) {
 
 func UpdateCulture(id int64, orgid int64, culture *models.DeviceCulture) error {
 
-	err := writeUserDb.Model(&culture).Where("id= ? AND user_org_id = ? AND status = ?", id, orgid, 1).Updates(map[string]interface{}{"speling_date": culture.SpelingDate, "specimen": culture.Specimen, "concentrate_noa": culture.ConcentrateNoa, "concentrate_nob": culture.ConcentrateNob, "sampling_locationa": culture.SamplingLocationa, "detection_unit": culture.DetectionUnit, "sampler": culture.Sampler, "reporting_date": culture.ReportingDate, "detection_result": culture.DetectionResult, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&culture).Where("id= ? AND user_org_id = ? AND status = ?", id, orgid, 1).Updates(map[string]interface{}{"speling_date": culture.SpelingDate, "specimen": culture.Specimen, "concentrate_noa": culture.ConcentrateNoa, "concentrate_nob": culture.ConcentrateNob, "sampling_locationa": culture.SamplingLocationa, "detection_unit": culture.DetectionUnit, "sampler": culture.Sampler, "reporting_date": culture.ReportingDate, "detection_result": culture.DetectionResult, "sort": culture.Sort, "pass_examination": culture.PassExamination, "modifications": culture.Modifications, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -518,7 +518,7 @@ func GetDialystate(id int64) (models.DeviceDialysate, error) {
 
 func Updatedialystate(id int64, orgid int64, dialysate *models.DeviceDialysate) error {
 
-	err := writeUserDb.Model(&dialysate).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": dialysate.SamplingDate, "specimenb": dialysate.Specimenb, "concentrate_noc": dialysate.ConcentrateNoc, "concentrateb_nod": dialysate.ConcentratebNod, "sampling_locationb": dialysate.SamplingLocationb, "detection_unit": dialysate.DetectionUnit, "samplerb": dialysate.Samplerb, "reporting_dateb": dialysate.ReportingDateb, "detection_resultb": dialysate.DetectionResultb, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&dialysate).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": dialysate.SamplingDate, "specimenb": dialysate.Specimenb, "concentrate_noc": dialysate.ConcentrateNoc, "concentrateb_nod": dialysate.ConcentratebNod, "sampling_locationb": dialysate.SamplingLocationb, "detection_unit": dialysate.DetectionUnit, "samplerb": dialysate.Samplerb, "reporting_dateb": dialysate.ReportingDateb, "detection_resultb": dialysate.DetectionResultb, "sort": dialysate.Sort, "pass_examination": dialysate.PassExamination, "modifications": dialysate.Modifications, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -548,7 +548,7 @@ func GetIon(id int64) (models.DeviceIon, error) {
 
 func UpdateIon(id int64, orgid int64, ion *models.DeviceIon) error {
 
-	err := writeUserDb.Model(&ion).Where("id = ? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": ion.SamplingDate, "samplerc": ion.Samplerc, "detection_unit": ion.DetectionUnit, "concentrate_nof": ion.ConcentrateNof, "concentrate_nog": ion.ConcentrateNog, "date_reportc": ion.DateReportc, "actual_na": ion.ActualNa, "actual_pna": ion.ActualPna, "actual_k": ion.ActualK, "actual_ca": ion.ActualCa, "actual_ci": ion.ActualCi, "actual_hco": ion.ActualCi, "actual_mg": ion.ActualMg, "actual_ph": ion.ActualPh, "remakes": ion.Remakes, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&ion).Where("id = ? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": ion.SamplingDate, "samplerc": ion.Samplerc, "detection_unit": ion.DetectionUnit, "concentrate_nof": ion.ConcentrateNof, "concentrate_nog": ion.ConcentrateNog, "date_reportc": ion.DateReportc, "actual_na": ion.ActualNa, "actual_pna": ion.ActualPna, "actual_k": ion.ActualK, "actual_ca": ion.ActualCa, "actual_ci": ion.ActualCi, "actual_hco": ion.ActualCi, "actual_mg": ion.ActualMg, "actual_ph": ion.ActualPh, "remakes": ion.Remakes, "sort": ion.Sort, "pass_examination": ion.PassExamination, "modifications": ion.Modifications, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1252,7 +1252,7 @@ func GetAllDeviceOxygenates(orgId int64) (dialysate []*models.DeviceDialysates,
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
 
 	return dialysate, err
 }
@@ -1264,7 +1264,7 @@ func GetAllHadWater(orgId int64) (dialysate []*models.DeviceDialysates, err erro
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
 
 	return dialysate, err
 }
@@ -1276,7 +1276,7 @@ func GetDeviceWater(orgId int64) (dialysate []*models.DeviceDialysates, err erro
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
 
 	return dialysate, err
 }
@@ -1288,7 +1288,7 @@ func GetDevicePH(orgId int64) (dialysate []*models.DeviceDialysates, err error)
 	if orgId > 0 {
 		db = db.Where("x.user_org_id = ?", orgId)
 	}
-	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
+	err = db.Group("x.id").Select("x.id,x.sampling_date,x.specimenb,x.concentrate_noc,x.concentrateb_nod,x.sampling_locationb,x.detection_unit,x.samplerb,x.reporting_dateb,x.detection_resultb,x.bed_id,x.bed,x.sort,x.pass_examination,x.modifications,r.user_name").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.samplerb").Scan(&dialysate).Error
 
 	return dialysate, err
 }
@@ -1410,7 +1410,7 @@ func GetOxygenatesById(id int64) (models.XtDeviceOxygenates, error) {
 }
 
 func UpdateOxygenates(id int64, orgid int64, dialysate *models.XtDeviceOxygenates) error {
-	err := writeUserDb.Model(&dialysate).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": dialysate.SamplingDate, "specimenb": dialysate.Specimenb, "concentrate_noc": dialysate.ConcentrateNoc, "concentrateb_nod": dialysate.ConcentratebNod, "sampling_locationb": dialysate.SamplingLocationb, "detection_unit": dialysate.DetectionUnit, "samplerb": dialysate.Samplerb, "reporting_dateb": dialysate.ReportingDateb, "detection_resultb": dialysate.DetectionResultb, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&dialysate).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": dialysate.SamplingDate, "specimenb": dialysate.Specimenb, "concentrate_noc": dialysate.ConcentrateNoc, "concentrateb_nod": dialysate.ConcentratebNod, "sampling_locationb": dialysate.SamplingLocationb, "detection_unit": dialysate.DetectionUnit, "samplerb": dialysate.Samplerb, "reporting_dateb": dialysate.ReportingDateb, "detection_resultb": dialysate.DetectionResultb, "sort": dialysate.Sort, "pass_examination": dialysate.PassExamination, "modifications": dialysate.Modifications, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
@@ -1501,18 +1501,18 @@ func DeleteBodyDisInfect(id int64) error {
 
 func UpdateHadWater(id int64, orgid int64, hadwater *models.XtDeviceHadwater) error {
 
-	err := writeUserDb.Model(&hadwater).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": hadwater.SamplingDate, "specimenb": hadwater.Specimenb, "concentrate_noc": hadwater.ConcentrateNoc, "concentrateb_nod": hadwater.ConcentratebNod, "sampling_locationb": hadwater.SamplingLocationb, "detection_unit": hadwater.DetectionUnit, "samplerb": hadwater.Samplerb, "reporting_dateb": hadwater.ReportingDateb, "detection_resultb": hadwater.DetectionResultb, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&hadwater).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": hadwater.SamplingDate, "specimenb": hadwater.Specimenb, "concentrate_noc": hadwater.ConcentrateNoc, "concentrateb_nod": hadwater.ConcentratebNod, "sampling_locationb": hadwater.SamplingLocationb, "detection_unit": hadwater.DetectionUnit, "samplerb": hadwater.Samplerb, "reporting_dateb": hadwater.ReportingDateb, "detection_resultb": hadwater.DetectionResultb, "sort": hadwater.Sort, "pass_examination": hadwater.PassExamination, "modifications": hadwater.Modifications, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
 func UpdateDeviceWater(id int64, orgid int64, hadwater *models.XtDeviceWater) error {
 
-	err := writeUserDb.Model(&hadwater).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": hadwater.SamplingDate, "specimenb": hadwater.Specimenb, "concentrate_noc": hadwater.ConcentrateNoc, "concentrateb_nod": hadwater.ConcentratebNod, "sampling_locationb": hadwater.SamplingLocationb, "detection_unit": hadwater.DetectionUnit, "samplerb": hadwater.Samplerb, "reporting_dateb": hadwater.ReportingDateb, "detection_resultb": hadwater.DetectionResultb, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&hadwater).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": hadwater.SamplingDate, "specimenb": hadwater.Specimenb, "concentrate_noc": hadwater.ConcentrateNoc, "concentrateb_nod": hadwater.ConcentratebNod, "sampling_locationb": hadwater.SamplingLocationb, "detection_unit": hadwater.DetectionUnit, "samplerb": hadwater.Samplerb, "reporting_dateb": hadwater.ReportingDateb, "detection_resultb": hadwater.DetectionResultb, "sort": hadwater.Sort, "pass_examination": hadwater.PassExamination, "modifications": hadwater.Modifications, "mtime": time.Now().Unix()}).Error
 	return err
 }
 
 func UpdateDivicePh(id int64, orgid int64, hadwater *models.XtDevicePh) error {
-	err := writeUserDb.Model(&hadwater).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": hadwater.SamplingDate, "specimenb": hadwater.Specimenb, "concentrate_noc": hadwater.ConcentrateNoc, "concentrateb_nod": hadwater.ConcentratebNod, "sampling_locationb": hadwater.SamplingLocationb, "detection_unit": hadwater.DetectionUnit, "samplerb": hadwater.Samplerb, "reporting_dateb": hadwater.ReportingDateb, "detection_resultb": hadwater.DetectionResultb, "mtime": time.Now().Unix()}).Error
+	err := writeUserDb.Model(&hadwater).Where("id=? AND user_org_id = ? AND status = 1", id, orgid).Updates(map[string]interface{}{"sampling_date": hadwater.SamplingDate, "specimenb": hadwater.Specimenb, "concentrate_noc": hadwater.ConcentrateNoc, "concentrateb_nod": hadwater.ConcentratebNod, "sampling_locationb": hadwater.SamplingLocationb, "detection_unit": hadwater.DetectionUnit, "samplerb": hadwater.Samplerb, "reporting_dateb": hadwater.ReportingDateb, "detection_resultb": hadwater.DetectionResultb, "sort": hadwater.Sort, "pass_examination": hadwater.PassExamination, "modifications": hadwater.Modifications, "mtime": time.Now().Unix()}).Error
 	return err
 }