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

controllers/base_api_controller.go

@@ -83,7 +83,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10702 //机构id
+		subscibe.OrgId = 10644 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,7 +93,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10702 //机构id小英9675或4
+		subscibe.OrgId = 10644 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,7 +339,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10702 //机构id小英9675或4
+		adminUserInfo.CurrentOrgId = 10644 //机构id小英9675或4
 		adminUserInfo.CurrentAppId = 12123 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes

controllers/data_api_controller.go

@@ -1023,6 +1023,10 @@ func (c *DataApiController) CreateAdviceTemplate() {
 
 				way := int64(items["way"].(float64))
 
+				remark := items["remark"].(string)
+
+				fmt.Println("remark--------------------------", remark)
+
 				subTemps := &models.DoctorAdviceTemplate{
 					AdviceName:            advice_name,
 					Status:                1,
@@ -1047,6 +1051,7 @@ func (c *DataApiController) CreateAdviceTemplate() {
 					Way:                   way,
 					DrugId:                drug_id,
 					DrugNameId:            0,
+					Remark:                remark,
 				}
 				subTemplate = append(subTemplate, subTemps)
 
@@ -1128,6 +1133,8 @@ func (c *DataApiController) UpdateAdviceTemplate() {
 	template.DrugId = template.DrugId
 	template.Way = template.Way
 
+	template.Remark = templatedata.Remark
+
 	err = service.UpdateAdviceTemplate(template)
 	if err != nil {
 		utils.ErrorLog("%v", err)
@@ -1295,6 +1302,7 @@ func (c *DataApiController) DeleteParentAdviceTemplate() {
 }
 
 func (c *DataApiController) CreateSubAdviceTemplate() {
+
 	drug_spec := c.GetString("drug_spec")
 	drug_spec_unit := c.GetString("drug_spec_unit")
 	advice_name := c.GetString("advice_name")
@@ -1309,6 +1317,8 @@ func (c *DataApiController) CreateSubAdviceTemplate() {
 	parent_id, _ := c.GetInt64("parent_id", 0)
 	drug_id, _ := c.GetInt64("drug_id")
 	way, _ := c.GetInt64("way")
+	remark := c.GetString("remark")
+
 	adminUserInfo := c.GetAdminUserInfo()
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -1343,6 +1353,7 @@ func (c *DataApiController) CreateSubAdviceTemplate() {
 		ParentId:              parent_id,
 		DrugId:                drug_id,
 		Way:                   way,
+		Remark:                remark,
 	}
 
 	if template.AdviceName == "" {

controllers/dialysis_api_controller.go

@@ -2331,7 +2331,7 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 	patient, _ := c.GetInt64("patient", 0)
 	recordDateStr := c.GetString("record_date")
 	record_time := c.GetString("record_time")
-	fmt.Println(recordDateStr)
+
 	if patient <= 0 {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 		return
@@ -2355,8 +2355,6 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 
 	startDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", record_time)
 
-	fmt.Println("startDate0000000000000000000000000000", startDate.Unix())
-
 	// data := make(map[string]interface{}, 0)
 	var data models.AssessmentAfterDislysis
 	var err error
@@ -5877,9 +5875,19 @@ func (this *DialysisApiController) GetTodayMonitor() {
 
 	if template.TemplateId == 6 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 {
 		if ultrafiltration_rate > 0 && adminInfo.CurrentOrgId != 9538 {
-			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
 
-			record.UltrafiltrationVolume = ultrafiltration_volume
+			if adminInfo.CurrentOrgId != 10735 {
+				ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+				record.UltrafiltrationVolume = ultrafiltration_volume
+			}
+
+			if adminInfo.CurrentOrgId == 10735 {
+
+				ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+				record.UltrafiltrationVolume = ultrafiltration_volume
+
+			}
+
 		}
 
 	}

controllers/dialysis_record_api_controller.go

@@ -1842,7 +1842,7 @@ func (this *DialysisRecordAPIController) FinishDialysis() {
 		service.CreateDialysisFinish(finishS)
 	}
 
-	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 9829 || adminUserInfo.CurrentOrgId == 10440 {
+	if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 9675 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 10414 || adminUserInfo.CurrentOrgId == 10432 || adminUserInfo.CurrentOrgId == 10445 || adminUserInfo.CurrentOrgId == 9829 || adminUserInfo.CurrentOrgId == 10440 || adminUserInfo.CurrentOrgId == 10735 {
 
 		evaluation, _ := service.MobileGetPredialysisEvaluationTwo(adminUserInfo.CurrentOrgId, patientID, recordDate.Unix())
 		if evaluation.SystolicBloodPressure == 0 {

controllers/drug_stock_api_contorller.go

@@ -1180,7 +1180,12 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 	}
 
 	if warehouse_out_id == 0 {
-		service.AddSigleDrugWarehouseOut(&warehouseOut)
+		//查询是否生成出库单
+		outIsExit, _ := service.GetDrugWarehouseOutIsExit(adminUserInfo.CurrentOrgId, 0, operation_time, warehousing_out_order)
+		if outIsExit.ID == 0 {
+			service.AddSigleDrugWarehouseOut(&warehouseOut)
+		}
+
 	}
 	if warehouse_out_id > 0 {
 		service.UpdateSingleDrugWarehouseOut(warehouse_out_id, storehouse_id)
@@ -1329,8 +1334,13 @@ func (c *StockDrugApiController) CreateDrugWarehouseOut() {
 	//调用出库逻辑
 	for _, item := range warehousingOutInfo {
 		if item.ID == 0 {
-			errOne := service.AddSigleDrugWarehouseOutInfo(item)
-			fmt.Println(errOne)
+			//查询改耗材是否出库
+			outInfo, _ := service.GetDrugsIsExsit(item.DrugId, item.SysRecordTime, item.OrgId, lastWarehouseOut.ID)
+			if outInfo.ID == 0 {
+				errOne := service.AddSigleDrugWarehouseOutInfo(item)
+				fmt.Println(errOne)
+			}
+
 		}
 		if item.ID > 0 {
 			service.UpdatedDrugWarehouseInfo(item, item.ID)

controllers/his_api_controller.go

@@ -3479,7 +3479,7 @@ func (c *HisApiController) CreateHisPrescription() {
 	var adviceList []models.HisDoctorAdviceInfo
 	var projectList []models.HisPrescriptionProject
 
-	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 {
+	if adminInfo.CurrentOrgId == 10489 || adminInfo.CurrentOrgId == 10510 || adminInfo.CurrentOrgId == 10164 || adminInfo.CurrentOrgId == 10478 || adminInfo.CurrentOrgId == 10318 || adminInfo.CurrentOrgId == 10480 || adminInfo.CurrentOrgId == 10633 || adminInfo.CurrentOrgId == 10610 || adminInfo.CurrentOrgId == 10402 || adminInfo.CurrentOrgId == 10138 || adminInfo.CurrentOrgId == 10278 || adminInfo.CurrentOrgId == 10537 || adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10644 || adminInfo.CurrentOrgId == 10635 || adminInfo.CurrentOrgId == 10598 || adminInfo.CurrentOrgId == 10028 || adminInfo.CurrentOrgId == 10721 || adminInfo.CurrentOrgId == 10726 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10571 || adminInfo.CurrentOrgId == 10724 || adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10731 || adminInfo.CurrentOrgId == 10653 || adminInfo.CurrentOrgId == 10567 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -985,7 +985,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		//针对古镇乐生
-		if adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10731 {
+		if adminUserInfo.Org.Id == 10731 {
 
 			dewater_amount = (evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight) * 1000
 			lastDialysisPrescription, _ := service.GetLastDialysisPrescription(id, adminUserInfo.Org.Id)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3047,7 +3047,7 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
-	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10693 || adminUserInfo.Org.Id == 10702 {
+	if adminUserInfo.Org.Id == 10101 || adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9675 || adminUserInfo.Org.Id == 10215 || adminUserInfo.Org.Id == 10233 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 10243 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 10414 || adminUserInfo.Org.Id == 10430 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10445 || adminUserInfo.Org.Id == 10223 || adminUserInfo.Org.Id == 9829 || adminUserInfo.Org.Id == 10432 || adminUserInfo.Org.Id == 10440 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 10693 || adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10735 {
 		evaluation, _ := service.MobileGetPredialysisEvaluationOne(adminUserInfo.Org.Id, id, recordDate.Unix())
 
 		if adminUserInfo.Org.Id != 10702 {
@@ -3189,6 +3189,12 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
 		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
 	}
+	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10735 {
+		tempassessmentAfterDislysis.SystolicBloodPressure = endmonitorRecords.SystolicBloodPressure
+		tempassessmentAfterDislysis.DiastolicBloodPressure = endmonitorRecords.DiastolicBloodPressure
+		tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
+		tempassessmentAfterDislysis.BreathingRate = endmonitorRecords.BreathingRate
+	}
 
 	if endmonitorRecords.ID > 0 && adminUserInfo.Org.Id == 10598 {
 		tempassessmentAfterDislysis.SystolicBloodPressure = 0
@@ -3329,6 +3335,8 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.SystolicBloodPressure = 0
 	}
 
+	tempassessmentAfterDislysis.RecordTime = dialysisOrder.EndTime
+
 	err := service.UpdateAssessmentAfterDislysisRecord(&tempassessmentAfterDislysis)
 
 	key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(id, 10) + ":" + strconv.FormatInt(recordDate.Unix(), 10) + ":assessment_after_dislysis"
@@ -4186,6 +4194,16 @@ func (this *DialysisAPIController) StartDialysis() {
 			record.BloodFlowVolume = prescription.BloodFlowVolume
 		}
 
+		//胶州少海医院
+		if adminUserInfo.Org.Id == 10735 {
+			befor, _ := service.GetAssessmentBeforThrity(adminUserInfo.Org.Id, patientID, recordDate.Unix())
+			dialysisPrescription, _ := service.GetDialysisPrescription(patientID, adminUserInfo.Org.Id, recordDate.Unix())
+			record.BreathingRate = befor.BreathingRate
+			record.BloodFlowVolume = dialysisPrescription.BloodFlowVolume
+			record.Temperature = befor.Temperature
+			record.PulseFrequency = befor.PulseFrequency
+		}
+
 		if adminUserInfo.Org.Id != 10683 {
 			err = service.CreateMonitor(&record)
 		}
@@ -5267,7 +5285,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 			if adminInfo.Org.Id == 10206 {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration * 1000 / float64(totalMin) * 60 * 1000)
-				fmt.Println("ultrafiltration_rate------------------", ultrafiltration_rate)
+
 				record.UltrafiltrationRate = ultrafiltration_rate / 1000
 			}
 			//if template.TemplateId == 47 {
@@ -5289,8 +5307,27 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	if template.TemplateId == 6 || template.TemplateId == 65 || template.TemplateId == 20 || template.TemplateId == 22 || template.TemplateId == 32 || template.TemplateId == 34 || template.TemplateId == 36 || template.TemplateId == 41 || template.TemplateId == 43 || template.TemplateId == 47 || template.TemplateId == 54 || adminInfo.Org.Id == 10599 { //adminInfo.Org.Id == 9538
 		if ultrafiltration_rate > 0 && adminInfo.Org.Id != 9538 {
-			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
-			record.UltrafiltrationVolume = ultrafiltration_volume
+
+			if adminInfo.Org.Id != 10735 {
+				ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+				record.UltrafiltrationVolume = ultrafiltration_volume
+			}
+			//胶州少海医院
+			if adminInfo.Org.Id == 10735 {
+
+				lastMonitorRecordList, _ := service.GetLastMonitorRecordList(patientID, monitorDate, adminInfo.Org.Id)
+				if lastMonitorRecordList.ID > 0 {
+					record.UltrafiltrationRate = lastMonitorRecordList.UltrafiltrationRate
+					ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * lastMonitorRecordList.UltrafiltrationRate)
+
+					record.UltrafiltrationVolume = ultrafiltration_volume
+				} else {
+					ultrafiltration_volume := math.Floor(float64(record.OperateTime+1800-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
+
+					record.UltrafiltrationVolume = ultrafiltration_volume
+				}
+
+			}
 
 		}
 	}

controllers/mobile_api_controllers/patient_api_controller.go

@@ -4301,6 +4301,17 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 
 	}
 
+	//揭阳
+	if adminUserInfo.Org.Id == 10597 {
+		if evaluation.ID == 0 {
+			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
+				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+				service.UpdateMobileGetDialysisPrescribe(dialysisPrescribeOne.ID, dewater_amount)
+			}
+		}
+	}
+
 	err = service.UpadatePredialysisEvaluation(&evaluation)
 
 	//记录日志
@@ -7082,7 +7093,7 @@ func (c *PatientApiController) CheckProject() {
 			for _, items := range ps {
 				ids = append(ids, items.ID)
 			}
-			err := service.UpdateTeamProjectCheckStatus(ids, project.PatientId, project.RecordDate, project.UserOrgId, adminInfo.AdminUser.Id, time.Now().Unix())
+			err := service.UpdateTeamProjectCheckStatus(ids, patient_id, record_date, adminInfo.Org.Id, adminInfo.AdminUser.Id, time.Now().Unix())
 			if err == nil {
 				c.ServeSuccessJSON(map[string]interface{}{
 					"project": project,

controllers/patient_api_controller.go

@@ -202,6 +202,14 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/deletecourestempalte", &PatientApiController{}, "Get:DeleteCouseTemplate")
 
+	beego.Router("/api/patient/getautopatientcontent", &PatientApiController{}, "Get:GetAutoPatientContent")
+
+	beego.Router("/api/patient/getpatientrescuerecord", &PatientApiController{}, "Get:GetPatientRescueRecord")
+
+	beego.Router("/api/patient/modifycourseprint", &PatientApiController{}, "Post:ModifyCoursePrint")
+
+	beego.Router("/api/patient/getpatientrescuerecordlist", &PatientApiController{}, "Get:GetPatientRescureRecordList")
+
 }
 func (c *PatientApiController) GetExportList() {
 	startTime := c.GetString("start_time")
@@ -4522,7 +4530,7 @@ func (c *PatientApiController) DeleteGroupAdvice() {
 		}
 	}
 
-	err := service.DeleteGroupAdviceOne(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id)
+	err := service.DeleteGroupAdvice(adminUserInfo.CurrentOrgId, groupNo, adminUserInfo.AdminUser.Id)
 
 	byterequest, _ := json.Marshal(advice)
 	doctorAdviceLog := models.XtDoctorAdviceLog{
@@ -8518,7 +8526,6 @@ func (this *PatientApiController) DeleteCouseTemplate() {
 
 	id, _ := this.GetInt64("id")
 
-	fmt.Println("id==================", id)
 	service.DeleteCouseTemplate(id)
 
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -8526,3 +8533,116 @@ func (this *PatientApiController) DeleteCouseTemplate() {
 	})
 
 }
+
+func (this *PatientApiController) GetAutoPatientContent() {
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	patient_id, _ := this.GetInt64("patient_id")
+
+	fmt.Println("patinet_id ===========================", patient_id)
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	var startTime int64
+	if len(start_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+
+	var endTime int64
+	if len(end_time) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_time+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		endTime = theTime.Unix()
+	}
+
+	//获取透析处方
+	prescription, _ := service.GetAutoDialysisPrescription(patient_id, startTime, endTime, orgId)
+
+	maxPrescription, _ := service.GetAutoMaxDialysisPrescription(patient_id, startTime, endTime, orgId)
+
+	minPrescription, _ := service.GetAutoMinDialysisPrescription(patient_id, startTime, endTime, orgId)
+
+	berfor, _ := service.GetAutoAssessmentBefor(patient_id, startTime, endTime, orgId)
+
+	monitorList, _ := service.GetAutoMonitorList(patient_id, startTime, endTime, orgId)
+
+	dryweightList, _ := service.GetAutoPatientDryWeight(patient_id, startTime, endTime, orgId)
+
+	inpectionList, _ := service.GetAutoInspectionList(patient_id, startTime, endTime, orgId)
+
+	dialysisOrder, _ := service.GetAutoDialysisOrder(patient_id, startTime, endTime, orgId)
+
+	patient, _ := service.GetPatientByIDOne(orgId, patient_id)
+
+	longAdvice, _ := service.GetLongDoctorAdvice(orgId, patient_id, startTime, endTime)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"prescription":    prescription,
+		"berfor":          berfor,
+		"monitorList":     monitorList,
+		"dryweightList":   dryweightList,
+		"inpectionList":   inpectionList,
+		"dialysisOrder":   dialysisOrder,
+		"patient":         patient,
+		"longAdvice":      longAdvice,
+		"maxPrescription": maxPrescription,
+		"minPrescription": minPrescription,
+	})
+
+}
+
+func (this *PatientApiController) GetPatientRescueRecord() {
+
+	id, _ := this.GetInt64("id")
+
+	rescueRecord, _ := service.GetPatientRescueRecord(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"rescueRecord": rescueRecord,
+	})
+}
+
+func (this *PatientApiController) ModifyCoursePrint() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println("err", err)
+	id := int64(dataBody["id"].(float64))
+	content := dataBody["content"].(string)
+
+	coursePrint, _ := service.ModifyCoursePrint(id, content)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"coursePrint": coursePrint,
+	})
+}
+
+func (this *PatientApiController) GetPatientRescureRecordList() {
+
+	id, _ := this.GetInt64("id")
+	patient_id, _ := this.GetInt64("patient_id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
+	patient, _ := service.GetPatientByIDOne(orgId, patient_id)
+
+	rescueRecordList, _ := service.GetPatientRescureRecordList(id)
+
+	operators, _ := service.GetAdminUserEsTwo(orgId, appId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"rescueRecordList": rescueRecordList,
+		"patient":          patient,
+		"operators":        operators,
+	})
+}

controllers/pharmacy_controller.go

@@ -576,6 +576,13 @@ func (this *PharmacyController) DrugWithdrawal() {
 	}
 	err = service.DrugWithdrawal(orgid, patient_id, stime, etime, creater)
 
+	prescriptionList, _ := service.GetHisPrescriptionByStartTime(orgid, patient_id, stime, etime)
+	if len(prescriptionList) > 0 {
+		for _, item := range prescriptionList {
+			service.ModiftyPrescpiton(item.ID)
+		}
+	}
+
 	if err != nil {
 		utils.ErrorLog(err.Error())
 		this.ServeFailJsonSend(enums.ErrorCodeParamWrong, err.Error())

controllers/self_drug_api_congtroller.go

@@ -3880,10 +3880,6 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 	}
 	var ids []int64
 	var goodIds []int64
-	//infoList, _ := service.GetGoodWarehouseInfoByOrgIdTwo(orgId)
-	//for _, it := range infoList {
-	//	goodIds = append(goodIds, it.GoodId)
-	//}
 
 	if len(keyword) > 0 {
 		manufacturers, _ := service.GetManufacturerListByKeyword(orgId, keyword)
@@ -4034,7 +4030,6 @@ func (this *SelfDrugApiController) GetGoodNewPurchaseStockQuery() {
 			//期间减少
 			banceOutList, _ := service.GetInitOutBanceList(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 
-			//banceOutList, _ := service.GetInitOutBanceTenty(item.ID, orgId, startTime, endTime, storeConfig.StorehouseOutInfo)
 			for _, it := range banceOutList {
 				item.WarehouseOutInfoTenty = append(item.WarehouseOutInfoTenty, it)
 			}

models/device_models.go

@@ -1000,6 +1000,7 @@ type XtAssessmentAfterDislysis struct {
 	SealingFluidDispose             string  `gorm:"column:sealing_fluid_dispose" json:"sealing_fluid_dispose" form:"sealing_fluid_dispose"`
 	Ktv                             string  `gorm:"column:ktv" json:"ktv" form:"ktv"`
 	Urr                             string  `gorm:"column:urr" json:"urr" form:"urr"`
+	RecordTime                      int64   `gorm:"column:record_time" json:"record_time" form:"record_time"`
 }
 
 func (XtAssessmentAfterDislysis) TableName() string {

models/doctor_advice_models.go

@@ -78,6 +78,7 @@ type DoctorAdviceTemplate struct {
 	Way                     int64                   `gorm:"column:way" json:"way" form:"way"`
 	DrugNameId              int64                   `gorm:"column:drug_name_id" json:"drug_name_id" form:"drug_name_id"`
 	SubDoctorAdviceTemplate []*DoctorAdviceTemplate `gorm:"ForeignKey:ParentId;AssociationForeignKey:ID" json:"child"`
+	Remark                  string                  `gorm:"column:remark" json:"remark" form:"remark"`
 }
 
 func (DoctorAdviceTemplate) TableName() string {

models/new_stock_models.go

@@ -242,7 +242,6 @@ type VmStockFlowTwenty struct {
 	Price               float64            `gorm:"column:price" json:"price" form:"price"`
 	WarehousingDetailId int64              `gorm:"column:warehousing_detail_id" json:"warehousing_detail_id" form:"warehousing_detail_id"`
 	BuyPrice            float64            `gorm:"column:buy_price" json:"buy_price" form:"buy_price"`
-	IsRead              int64              `gorm:"column:is_read" json:"is_read" form:"is_read"`
 	OverCount           int64              `gorm:"column:over_count" json:"over_count" form:"over_count"`
 	Ctime               int64              `gorm:"column:ctime" json:"ctime" form:"ctime"`
 	StorehouseId        int64              `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`

models/patient_models.go

@@ -2880,3 +2880,138 @@ func (XtDeathRecord) TableName() string {
 
 	return "xt_death_record"
 }
+
+type XtAutoDialysisPrescription struct {
+	ID                         int64   `gorm:"column:id" json:"id" form:"id"`
+	UserOrgId                  int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	PatientId                  int64   `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	Dialyzer                   int64   `gorm:"column:dialyzer" json:"dialyzer" form:"dialyzer"`
+	MachineType                string  `gorm:"column:machine_type" json:"machine_type" form:"machine_type"`
+	DewaterAmount              float64 `gorm:"column:dewater_amount" json:"dewater_amount" form:"dewater_amount"`
+	DialyzerPerfusionApparatus string  `gorm:"column:dialyzer_perfusion_apparatus" json:"dialyzer_perfusion_apparatus" form:"dialyzer_perfusion_apparatus"`
+	PrescriptionDewatering     float64 `gorm:"column:prescription_dewatering" json:"prescription_dewatering" form:"prescription_dewatering"`
+	Anticoagulant              int64   `gorm:"column:anticoagulant" json:"anticoagulant" form:"anticoagulant"`
+	AnticoagulantShouji        float64 `gorm:"column:anticoagulant_shouji" json:"anticoagulant_shouji" form:"anticoagulant_shouji"`
+	AnticoagulantWeichi        float64 `gorm:"column:anticoagulant_weichi" json:"anticoagulant_weichi" form:"anticoagulant_weichi"`
+	AnticoagulantZongliang     float64 `gorm:"column:anticoagulant_zongliang" json:"anticoagulant_zongliang" form:"anticoagulant_zongliang"`
+	AnticoagulantGaimingcheng  string  `gorm:"column:anticoagulant_gaimingcheng" json:"anticoagulant_gaimingcheng" form:"anticoagulant_gaimingcheng"`
+	AnticoagulantGaijiliang    string  `gorm:"column:anticoagulant_gaijiliang" json:"anticoagulant_gaijiliang" form:"anticoagulant_gaijiliang"`
+	ModeId                     int64   `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	DialysisDurationHour       int64   `gorm:"column:dialysis_duration_hour" json:"dialysis_duration_hour" form:"dialysis_duration_hour"`
+	DialysisDurationMinute     int64   `gorm:"column:dialysis_duration_minute" json:"dialysis_duration_minute" form:"dialysis_duration_minute"`
+	DialysisDuration           float64 `gorm:"column:dialysis_duration" json:"dialysis_duration" form:"dialysis_duration"`
+	ReplacementTotal           float64 `gorm:"column:replacement_total" json:"replacement_total" form:"replacement_total"`
+	ReplacementWay             int64   `gorm:"column:replacement_way" json:"replacement_way" form:"replacement_way"`
+	HemodialysisMachine        int64   `gorm:"column:hemodialysis_machine" json:"hemodialysis_machine" form:"hemodialysis_machine"`
+	BloodFilter                int64   `gorm:"column:blood_filter" json:"blood_filter" form:"blood_filter"`
+	PerfusionApparatus         int64   `gorm:"column:perfusion_apparatus" json:"perfusion_apparatus" form:"perfusion_apparatus"`
+	DryWeight                  float64 `gorm:"column:dry_weight" json:"dry_weight" form:"dry_weight"`
+	VascularAccessMode         int64   `gorm:"column:vascular_access_mode" json:"vascular_access_mode" form:"vascular_access_mode"`
+	VascularAccess             int64   `gorm:"column:vascular_access" json:"vascular_access" form:"vascular_access"`
+	BloodFlowVolume            float64 `gorm:"column:blood_flow_volume" json:"blood_flow_volume" form:"blood_flow_volume"`
+	DialysateFlow              float64 `gorm:"column:dialysate_flow" json:"dialysate_flow" form:"dialysate_flow"`
+	DisplaceLiqui              float64 `gorm:"column:displace_liqui" json:"displace_liqui" form:"displace_liqui"`
+	Kalium                     float64 `gorm:"column:kalium" json:"kalium" form:"kalium"`
+	Sodium                     float64 `gorm:"column:sodium" json:"sodium" form:"sodium"`
+	Calcium                    float64 `gorm:"column:calcium" json:"calcium" form:"calcium"`
+	Bicarbonate                float64 `gorm:"column:bicarbonate" json:"bicarbonate" form:"bicarbonate"`
+	Glucose                    float64 `gorm:"column:glucose" json:"glucose" form:"glucose"`
+	DialysateTemperature       float64 `gorm:"column:dialysate_temperature" json:"dialysate_temperature" form:"dialysate_temperature"`
+	Conductivity               float64 `gorm:"column:conductivity" json:"conductivity" form:"conductivity"`
+	PrescriptionDoctor         int64   `gorm:"column:prescription_doctor" json:"prescription_doctor" form:"prescription_doctor"`
+	Creater                    int64   `gorm:"column:creater" json:"creater" form:"creater"`
+	Modifier                   int64   `gorm:"column:modifier" json:"modifier" form:"modifier"`
+	Remark                     string  `gorm:"column:remark" json:"remark" form:"remark"`
+	Status                     int64   `gorm:"column:status" json:"status" form:"status"`
+	CreatedTime                int64   `gorm:"column:created_time" json:"created_time" form:"created_time"`
+	UpdatedTime                int64   `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
+	RecordDate                 int64   `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	RecordId                   int64   `gorm:"column:record_id" json:"record_id" form:"record_id"`
+	TargetUltrafiltration      float64 `gorm:"column:target_ultrafiltration" json:"target_ultrafiltration" form:"target_ultrafiltration"`
+	DialysateFormulation       int64   `gorm:"column:dialysate_formulation" json:"dialysate_formulation" form:"dialysate_formulation"`
+	BodyFluid                  int64   `gorm:"column:body_fluid" json:"body_fluid" form:"body_fluid"`
+	SpecialMedicine            int64   `gorm:"column:special_medicine" json:"special_medicine" form:"special_medicine"`
+	SpecialMedicineOther       string  `gorm:"column:special_medicine_other" json:"special_medicine_other" form:"special_medicine_other"`
+	DisplaceLiquiPart          int64   `gorm:"column:displace_liqui_part" json:"displace_liqui_part" form:"displace_liqui_part"`
+	BloodAccess                int64   `gorm:"column:blood_access" json:"blood_access" form:"blood_access"`
+	DisplaceLiquiValue         float64 `gorm:"column:displace_liqui_value" json:"displace_liqui_value" form:"displace_liqui_value"`
+	Ultrafiltration            float64 `gorm:"column:ultrafiltration" json:"ultrafiltration" form:"ultrafiltration"`
+	BodyFluidOther             string  `gorm:"column:body_fluid_other" json:"body_fluid_other" form:"body_fluid_other"`
+	Niprocart                  int64   `gorm:"column:niprocart" json:"niprocart" form:"niprocart"`
+	Jms                        int64   `gorm:"column:jms" json:"jms" form:"jms"`
+	FistulaNeedleSet           int64   `gorm:"column:fistula_needle_set" json:"fistula_needle_set" form:"fistula_needle_set"`
+	FistulaNeedleSet16         int64   `gorm:"column:fistula_needle_set_16" json:"fistula_needle_set_16" form:"fistula_needle_set_16"`
+	Hemoperfusion              int64   `gorm:"column:hemoperfusion" json:"hemoperfusion" form:"hemoperfusion"`
+	DialyserSterilised         int64   `gorm:"column:dialyser_sterilised" json:"dialyser_sterilised" form:"dialyser_sterilised"`
+	Filtryzer                  int64   `gorm:"column:filtryzer" json:"filtryzer" form:"filtryzer"`
+	TargetKtv                  float64 `gorm:"column:target_ktv" json:"target_ktv" form:"target_ktv"`
+	Dialyzers                  int64   `gorm:"column:dialyzers" json:"dialyzers" form:"dialyzers"`
+	Injector                   int64   `gorm:"column:injector" json:"injector" form:"injector"`
+	Bloodlines                 int64   `gorm:"column:bloodlines" json:"bloodlines" form:"bloodlines"`
+	TubingHemodialysis         int64   `gorm:"column:tubing_hemodialysis" json:"tubing_hemodialysis" form:"tubing_hemodialysis"`
+	Package                    int64   `gorm:"column:package" json:"package" form:"package"`
+	ALiquid                    int64   `gorm:"column:a_liquid" json:"a_liquid" form:"a_liquid"`
+	PreImpulse                 string  `gorm:"column:pre_impulse" json:"pre_impulse" form:"pre_impulse"`
+	AnticoagulantStopTimeHour  int64   `gorm:"column:anticoagulant_stop_time_hour" json:"anticoagulant_stop_time_hour" form:"anticoagulant_stop_time_hour"`
+	AnticoagulantStopTimeMin   int64   `gorm:"column:anticoagulant_stop_time_min" json:"anticoagulant_stop_time_min" form:"anticoagulant_stop_time_min"`
+	HeparinSodium              string  `gorm:"column:heparin_sodium" json:"heparin_sodium" form:"heparin_sodium"`
+	Nucleoprotamine            string  `gorm:"column:nucleoprotamine" json:"nucleoprotamine" form:"nucleoprotamine"`
+	PushTheProtamine           string  `gorm:"column:push_the_protamine" json:"push_the_protamine" form:"push_the_protamine"`
+	NoHeparinRemarks           string  `gorm:"column:no_heparin_remarks" json:"no_heparin_remarks" form:"no_heparin_remarks"`
+	Blood                      string  `gorm:"column:blood" json:"blood" form:"blood"`
+	AntioxidantCommodityName   string  `gorm:"column:antioxidant_commodity_name" json:"antioxidant_commodity_name" form:"antioxidant_commodity_name"`
+	DialysisDialyszers         string  `gorm:"column:dialysis_dialyszers" json:"dialysis_dialyszers" form:"dialysis_dialyszers"`
+	DialysisIrrigation         string  `gorm:"column:dialysis_irrigation" json:"dialysis_irrigation" form:"dialysis_irrigation"`
+	DisplaceSpeed              string  `gorm:"column:displace_speed" json:"displace_speed" form:"displace_speed"`
+	Illness                    int64   `gorm:"column:illness" json:"illness" form:"illness"`
+	Amylaceum                  string  `gorm:"column:amylaceum" json:"amylaceum" form:"amylaceum"`
+	SingleTime                 string  `gorm:"column:single_time" json:"single_time" form:"single_time"`
+	SingleWater                string  `gorm:"column:single_water" json:"single_water" form:"single_water"`
+	ReplacementFlow            string  `gorm:"column:replacement_flow" json:"replacement_flow" form:"replacement_flow"`
+	PlasmaSeparator            string  `gorm:"column:plasma_separator" json:"plasma_separator" form:"plasma_separator"`
+	BilirubinAdsorptionColumn  string  `gorm:"column:bilirubin_adsorption_column" json:"bilirubin_adsorption_column" form:"bilirubin_adsorption_column"`
+	OxygenUptake               int64   `gorm:"column:oxygen_uptake" json:"oxygen_uptake" form:"oxygen_uptake"`
+	OxygenFlow                 string  `gorm:"column:oxygen_flow" json:"oxygen_flow" form:"oxygen_flow"`
+	OxygenTime                 string  `gorm:"column:oxygen_time" json:"oxygen_time" form:"oxygen_time"`
+	HemodialysisPipelines      string  `gorm:"column:hemodialysis_pipelines" json:"hemodialysis_pipelines" form:"hemodialysis_pipelines"`
+	HemodialysisPipelinesCount float64 `gorm:"column:hemodialysis_pipelines_count" json:"hemodialysis_pipelines_count" form:"hemodialysis_pipelines_count"`
+	PunctureNeedle             string  `gorm:"column:puncture_needle" json:"puncture_needle" form:"puncture_needle"`
+	PunctureNeedleCount        float64 `gorm:"column:puncture_needle_count" json:"puncture_needle_count" form:"puncture_needle_count"`
+	Epo                        string  `gorm:"column:epo" json:"epo" form:"epo"`
+	EpoCount                   float64 `gorm:"column:epo_count" json:"epo_count" form:"epo_count"`
+	MaxUltrafiltrationRate     float64 `gorm:"column:max_ultrafiltration_rate" json:"max_ultrafiltration_rate" form:"max_ultrafiltration_rate"`
+	AdminUserId                int64   `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	DrhyWater                  string  `gorm:"column:drhy_water" json:"drhy_water" form:"drhy_water"`
+	IsWater                    int64   `gorm:"column:is_water" json:"is_water" form:"is_water"`
+	DryWaterHour               string  `gorm:"column:dry_water_hour" json:"dry_water_hour" form:"dry_water_hour"`
+	WaterMachine               string  `gorm:"column:water_machine" json:"water_machine" form:"water_machine"`
+	AddAmount                  float64 `gorm:"column:add_amount" json:"add_amount" form:"add_amount"`
+	ReduceAmount               float64 `gorm:"column:reduce_amount" json:"reduce_amount" form:"reduce_amount"`
+	DialysisRemark             string  `gorm:"column:dialysis_remark" json:"dialysis_remark" form:"dialysis_remark"`
+	PrescribingNumber          float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	TreatmentRemark            string  `gorm:"column:treatment_remark" json:"treatment_remark" form:"treatment_remark"`
+	PrescriptionSodium         string  `gorm:"column:prescription_sodium" json:"prescription_sodium" form:"prescription_sodium"`
+	StartSodium                string  `gorm:"column:start_sodium" json:"start_sodium" form:"start_sodium"`
+	SodiumCurve                string  `gorm:"column:sodium_curve" json:"sodium_curve" form:"sodium_curve"`
+	DialysisFluidFlow          string  `gorm:"column:dialysis_fluid_flow" json:"dialysis_fluid_flow" form:"dialysis_fluid_flow"`
+	SodiumBicarbonateFlow      string  `gorm:"column:sodium_bicarbonate_flow" json:"sodium_bicarbonate_flow" form:"sodium_bicarbonate_flow"`
+	PrescriptionWater          float64 `gorm:"column:prescription_water" json:"prescription_water" form:"prescription_water"`
+	DialysisStrainer           string  `gorm:"column:dialysis_strainer" json:"dialysis_strainer" form:"dialysis_strainer"`
+	Chaptalization             string  `gorm:"column:chaptalization" json:"chaptalization" form:"chaptalization"`
+	WarshCount                 string  `gorm:"column:warsh_count" json:"warsh_count" form:"warsh_count"`
+	WashingTime                string  `gorm:"column:washing_time" json:"washing_time" form:"washing_time"`
+	BloodAccessPartId          string  `gorm:"column:blood_access_part_id" json:"blood_access_part_id" form:"blood_access_part_id"`
+	AnticoagulantWeichiHour    string  `gorm:"column:anticoagulant_weichi_hour" json:"anticoagulant_weichi_hour" form:"anticoagulant_weichi_hour"`
+	Dialyzate                  string  `gorm:"column:dialyzate" json:"dialyzate" form:"dialyzate"`
+	DialysisDialyszersId       int64   `gorm:"column:dialysis_dialyszers_id" json:"dialysis_dialyszers_id" form:"dialysis_dialyszers_id"`
+	DialysisStrainerId         int64   `gorm:"column:dialysis_strainer_id" json:"dialysis_strainer_id" form:"dialysis_strainer_id"`
+	DialysisIrrigationId       int64   `gorm:"column:dialysis_irrigation_id" json:"dialysis_irrigation_id" form:"dialysis_irrigation_id"`
+	FirstSuper                 int64   `gorm:"column:first_super" json:"first_super" form:"first_super"`
+	IsSequential               int64   `gorm:"column:is_sequential" json:"is_sequential" form:"is_sequential"`
+	Conduct                    string  `gorm:"column:conduct" json:"conduct" form:"conduct"`
+}
+
+func (XtAutoDialysisPrescription) TableName() string {
+
+	return "xt_dialysis_prescription"
+}

models/stock_models.go

@@ -115,13 +115,14 @@ func (StWarehousingInfo) TableName() string {
 }
 
 type StWarehousingInfoOne struct {
-	ID               int64  `gorm:"column:id" json:"id"`
-	GoodId           int64  `gorm:"column:good_id" json:"good_id"`
-	WarehousingCount int64  `gorm:"column:warehousing_count" json:"warehousing_count"`
-	WarehousingUnit  string `gorm:"column:warehousing_unit" json:"warehousing_unit"`
-	PackingUnit      string `json:"packing_unit"`
-	StorehouseId     int64  `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
-	OrgId            int64  `gorm:"column:org_id" json:"org_id"`
+	ID               int64   `gorm:"column:id" json:"id"`
+	GoodId           int64   `gorm:"column:good_id" json:"good_id"`
+	WarehousingCount int64   `gorm:"column:warehousing_count" json:"warehousing_count"`
+	WarehousingUnit  string  `gorm:"column:warehousing_unit" json:"warehousing_unit"`
+	PackingUnit      string  `json:"packing_unit"`
+	StorehouseId     int64   `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
+	OrgId            int64   `gorm:"column:org_id" json:"org_id"`
+	Price            float64 `gorm:"column:price" json:"price" form:"price"`
 }
 
 func (StWarehousingInfoOne) TableName() string {
@@ -1731,14 +1732,15 @@ func (WarehousingInfoNight) TableName() string {
 }
 
 type WarehouseOutInfoTenty struct {
-	ID            int64 `gorm:"column:id" json:"id" form:"id"`
-	GoodId        int64 `gorm:"column:good_id" json:"good_id" form:"good_id"`
-	Count         int64 `gorm:"column:count" json:"count" form:"count"`
-	Mtime         int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	Ctime         int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Status        int64 `gorm:"column:status" json:"status" form:"status"`
-	OrgId         int64 `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	SysRecordTime int64 `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	ID            int64   `gorm:"column:id" json:"id" form:"id"`
+	GoodId        int64   `gorm:"column:good_id" json:"good_id" form:"good_id"`
+	Count         int64   `gorm:"column:count" json:"count" form:"count"`
+	Mtime         int64   `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Ctime         int64   `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Status        int64   `gorm:"column:status" json:"status" form:"status"`
+	OrgId         int64   `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	SysRecordTime int64   `gorm:"column:sys_record_time" json:"sys_record_time" form:"sys_record_time"`
+	Price         float64 `gorm:"column:price" json:"price" form:"price"`
 }
 
 func (WarehouseOutInfoTenty) TableName() string {

service/doctor_advice_service.go

@@ -237,11 +237,11 @@ func CreateSubTemplate(template []*models.DoctorAdviceTemplate) (err error) {
 		utx := writeDb.Begin()
 		if len(template) > 0 {
 			thisSQL := "INSERT INTO xt_doctor_advice_template (org_id, advice_name, advice_desc, single_dose, single_dose_unit,prescribing_number," +
-				"prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,drug_id,way) VALUES "
+				"prescribing_number_unit,delivery_way,execution_frequency,advice_doctor,status,created_time,updated_time,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,drug_id,way,remark) VALUES "
 			insertParams := make([]string, 0)
 			insertData := make([]interface{}, 0)
 			for _, info := range template {
-				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
+				insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
 				insertData = append(insertData, info.OrgId)
 				insertData = append(insertData, info.AdviceName)
 				insertData = append(insertData, info.AdviceDesc)
@@ -264,6 +264,7 @@ func CreateSubTemplate(template []*models.DoctorAdviceTemplate) (err error) {
 				insertData = append(insertData, info.FrequencyType)
 				insertData = append(insertData, info.DrugId)
 				insertData = append(insertData, info.Way)
+				insertData = append(insertData, info.Remark)
 			}
 			thisSQL += strings.Join(insertParams, ", ")
 			err = utx.Exec(thisSQL, insertData...).Error
@@ -373,7 +374,7 @@ func ModifyHisTemplateName(id int64, template_name string) (err error) {
 
 func FindOtherAllAdviceTemplate(org_id int64) (temps []*models.DoctorAdviceParentTemplate, err error) {
 	err = readDb.Model(&models.DoctorAdviceParentTemplate{}).Preload("DoctorAdviceTemplate", func(db *gorm.DB) *gorm.DB {
-		return db.Select("id,advice_name,advice_desc,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,status,created_time,updated_time,parent_id,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,drug_id,way, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
+		return db.Select("id,advice_name,advice_desc,single_dose,single_dose_unit,prescribing_number,prescribing_number_unit,delivery_way,execution_frequency,status,created_time,updated_time,parent_id,template_id,drug_spec,drug_spec_unit,advice_type,day_count,week_days,frequency_type,drug_id,way,remark, IF(parent_id>0, parent_id, id) as advice_order").Where("status = 1").Order("advice_order desc, id")
 	}).Where("org_id = ? AND status=1 ", org_id).Find(&temps).Error
 	return
 	//.Scan(&advices).Error

service/patient_dataconfig_service.go

@@ -175,3 +175,10 @@ func GetPatientByIDThree(orgID int64, patientID int64) (*models.Patients, error)
 	}
 	return &patient, nil
 }
+
+func GetLongDoctorAdvice(org_id int64, patient_id int64, start_time int64, end_time int64) (advice []*models.DoctorAdvice, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=1 and patient_id = ? and created_time >=? and created_time<=? and advice_type=1", org_id, patient_id, 1514736000, end_time).Find(&advice).Error
+
+	return advice, err
+}

service/patient_service.go

@@ -4537,3 +4537,167 @@ func DeleteCouseTemplate(id int64) error {
 
 	return err
 }
+
+func GetAutoDialysisPrescription(patient_id int64, start_time int64, end_time int64, org_id int64) (prescription []*models.XtAutoDialysisPrescription, err error) {
+
+	db := XTReadDB().Model(&prescription).Where("status=1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("record_date>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("record_date<=?", end_time)
+	}
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	err = db.Find(&prescription).Error
+	return prescription, err
+}
+
+func GetAutoMaxDialysisPrescription(patient_id int64, start_time int64, end_time int64, org_id int64) (models.DialysisPrescription, error) {
+
+	prescription := models.DialysisPrescription{}
+	err := XTReadDB().Raw("select MAX(anticoagulant_zongliang) from xt_dialysis_prescripiton where patient_id = ? and record_date>=? and record_date<=? and org_id = ?", patient_id, start_time, end_time, org_id).Scan(&prescription).Error
+	return prescription, err
+}
+
+func GetAutoMinDialysisPrescription(patient_id int64, start_time int64, end_time int64, org_id int64) (models.DialysisPrescription, error) {
+	prescription := models.DialysisPrescription{}
+	err := XTReadDB().Raw("select Min(anticoagulant_zongliang) from xt_dialysis_prescripiton where patient_id = ? and record_date>=? and record_date<=? and org_id = ?", patient_id, start_time, end_time, org_id).Scan(&prescription).Error
+	return prescription, err
+}
+
+func GetAutoAssessmentBefor(patient_id int64, start_time int64, end_time int64, org_id int64) (berfor []*models.XtAssessmentBeforeDislysis, err error) {
+
+	db := XTReadDB().Model(&berfor).Where("status=1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("assessment_date>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("assessment_date<=?", end_time)
+	}
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	err = db.Find(&berfor).Error
+	return berfor, err
+}
+
+func GetAutoMonitorList(patient_id int64, start_time int64, end_time int64, org_id int64) (monitor []*models.XTMonitoringRecord, err error) {
+
+	db := XTReadDB().Model(&monitor).Where("status=1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("monitoring_date>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("monitoring_date<=?", end_time)
+	}
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	err = db.Find(&monitor).Error
+	return monitor, err
+}
+
+func GetAutoPatientDryWeight(patient_id int64, start_time int64, end_time int64, org_id int64) (dryweight []*models.SgjPatientDryweight, err error) {
+
+	db := XTReadDB().Model(&dryweight).Where("status=1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if org_id > 0 {
+		db = db.Where("user_org_id = ?", org_id)
+	}
+	err = db.Order("id asc").Find(&dryweight).Error
+	return dryweight, err
+}
+
+func GetAutoInspectionList(patient_id int64, start_time int64, end_time int64, org_id int64) (inpection []*models.XtInspection, err error) {
+
+	db := XTReadDB().Model(&inpection).Where("status=1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("inspect_date>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("inspect_date<=?", end_time)
+	}
+	if org_id > 0 {
+		db = db.Where("org_id = ?", org_id)
+	}
+	err = db.Find(&inpection).Error
+	return inpection, err
+}
+
+func GetPatientDialysisOrder(org_id int64) (order []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=1 and dialysis_date<1733155200", org_id).Find(&order).Error
+
+	return order, err
+}
+
+func UpdateAssesmentAfeter(patient_id int64, dialysis_date int64, end_time int64) (models.XtAssessmentAfterDislysis, error) {
+
+	dialysisOrder := models.XtAssessmentAfterDislysis{}
+
+	err := XTWriteDB().Model(&dialysisOrder).Where("patient_id = ? and assessment_date =? and status=1", patient_id, dialysis_date).Updates(map[string]interface{}{"record_time": end_time}).Error
+
+	return dialysisOrder, err
+}
+
+func GetPatientRescueRecord(id int64) (models.XtPatientRescueRecord, error) {
+
+	rescueRecords := models.XtPatientRescueRecord{}
+
+	err := XTReadDB().Where("id = ? and status=1", id).Find(&rescueRecords).Error
+
+	return rescueRecords, err
+}
+
+func ModifyCoursePrint(id int64, content string) (models.XtPatientRescueRecord, error) {
+
+	rescueRecord := models.XtPatientRescueRecord{}
+
+	err := XTWriteDB().Model(&rescueRecord).Where("id = ? and status=1", id).Updates(map[string]interface{}{"content": content}).Error
+
+	return rescueRecord, err
+}
+
+func GetPatientRescureRecordList(id int64) (rescueRecord []*models.XtPatientRescueRecord, err error) {
+
+	err = XTWriteDB().Model(&rescueRecord).Where("id = ? and status=1", id).Find(&rescueRecord).Error
+
+	return rescueRecord, err
+}
+
+func GetAutoDialysisOrder(patient_id int64, start_time int64, end_time int64, user_org_id int64) (order []*models.XtDialysisOrder, err error) {
+
+	err = XTReadDB().Where("patient_id = ? and dialysis_date>=? and dialysis_date<=? and user_org_id = ? and status=1", patient_id, start_time, end_time, user_org_id).Find(&order).Error
+
+	return order, err
+}

service/pharmacy_service.go

@@ -614,27 +614,25 @@ func GetManyDrugs(orgid int64, keyword string) (map[int64]models.PharmacyBaseDru
 // 查询(
 func GetTodayMedicine(stime, etime, orgid, is_medicine int64, keyword string) (finlly []*models.ListOfDrugs, err error) {
 	InitDrugidIsNil(orgid, stime, etime)
-
-	fmt.Println("startime==========================", stime)
 	var tmp []*models.TmpLLL
 	if is_medicine == 0 {
 		if keyword != "" {
 			keyword = "%" + keyword + "%"
 			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct drug_id from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1)",
 				stime, etime, orgid, is_medicine, orgid, keyword, stime, etime, orgid, is_medicine, orgid, keyword).Scan(&tmp).Error
 		} else {
 			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct drug_id from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and is_pharmacy = 1) ",
 				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
 		}
@@ -645,20 +643,20 @@ func GetTodayMedicine(stime, etime, orgid, is_medicine int64, keyword string) (f
 		if keyword != "" {
 			keyword = "%" + keyword + "%"
 			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1) "+
 				"union "+
 				"select distinct drug_id from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and drug_name like ? and is_pharmacy = 1)",
 				stime, etime, orgid, is_medicine, orgid, keyword, stime, etime, orgid, is_medicine, orgid, keyword).Scan(&tmp).Error
 		} else {
 			err = XTReadDB().Raw("select distinct drug_id from his_doctor_advice_info where "+
-				"status = 1 and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) "+
 				"union "+
 				"select distinct drug_id from xt_doctor_advice where "+
-				"status = 1 and (advice_type = 2 or advice_type = 3) and created_time >= ? and created_time <= ? and user_org_id = ? and is_medicine = ? and "+
+				"status = 1 and (advice_type = 2 or advice_type = 3) and advice_date >= ? and advice_date <= ? and user_org_id = ? and is_medicine = ? and "+
 				"drug_id in (select id from xt_base_drug where org_id = ? and status = 1) ",
 				stime, etime, orgid, is_medicine, orgid, stime, etime, orgid, is_medicine, orgid).Scan(&tmp).Error
 		}
@@ -1065,6 +1063,19 @@ func UpdateIsAdvice(id int64) (err error) {
 	return err
 }
 
+func GetHisPrescriptionByStartTime(org_id int64, patient_id int64, start_time int64, end_time int64) (prescription []*models.HisPrescription, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and record_date>=? and record_date<=? and status=1 and is_medicine =1", org_id, patient_id, start_time, end_time).Find(&prescription).Error
+	return prescription, err
+}
+
+func ModiftyPrescpiton(id int64) (models.HisPrescription, error) {
+
+	prescription := models.HisPrescription{}
+	err := XTWriteDB().Model(&prescription).Where("id = ? and status=1", id).Updates(map[string]interface{}{"is_medicine": 0}).Error
+	return prescription, err
+}
+
 // 患者退药按钮点击
 func DrugWithdrawal(orgid, patient_id, stime, etime, creater int64) (err error) {
 	//开事务

service/stock_service.go

@@ -1604,6 +1604,14 @@ func UpdateSingleWarehoseOut(id int64, storehouse_id int64) error {
 	return err
 }
 
+func GetDrugWarehouseOutIsExit(org_id int64, is_sys int, record_time int64, warehousing_out_order string) (models.DrugWarehouseOut, error) {
+
+	drugWarehouseOut := models.DrugWarehouseOut{}
+	err := XTReadDB().Where("is_sys = ? AND status = 1 AND org_id = ? AND warehouse_out_time = ? and warehouse_out_order_number = ?", is_sys, org_id, record_time, warehousing_out_order).Find(&drugWarehouseOut).Error
+
+	return drugWarehouseOut, err
+}
+
 func AddSigleDrugWarehouseOut(warehouseOut *models.DrugWarehouseOut) error {
 	err := writeDb.Create(&warehouseOut).Error
 	return err
@@ -3526,6 +3534,13 @@ func GetGoodsIsExsit(good_id int64, sys_record_time int64, org_id int64, warehou
 	return outInfo, err
 }
 
+func GetDrugsIsExsit(drug_id int64, sys_record_time int64, org_id int64, warehouse_out_id int64) (models.XtDrugWarehouseOutInfo, error) {
+
+	outInfo := models.XtDrugWarehouseOutInfo{}
+	err := XTReadDB().Where("drug_id = ? and sys_record_time = ? and org_id = ? and is_sys =0 and status = 1 and warehouse_out_id = ?", drug_id, sys_record_time, org_id, warehouse_out_id).Find(&outInfo).Error
+	return outInfo, err
+}
+
 func AddSigleWarehouseOutInfo(info *models.WarehouseOutInfo) error {
 
 	err := writeDb.Create(&info).Error