历史排班

conf/app.conf

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

controllers/base_api_controller.go

@@ -82,7 +82,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10394 //机构id
+		subscibe.OrgId = 9671 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -92,8 +92,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10394 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3295  //4
+		adminUserInfo.CurrentOrgId = 9671  //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 15993 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -328,7 +328,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10394 //机构id小英9675或4
+		subscibe.OrgId = 9671 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -338,8 +338,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10394 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 3295  //4
+		adminUserInfo.CurrentOrgId = 9671  //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 15993 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/data_api_controller.go

@@ -400,7 +400,7 @@ func configFormData(dataconfig *models.Dataconfig, data []byte) (code int) {
 	}
 	dataconfig.Module = module
 
-	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" || module == "catheter_operation" || module == "main_content" || module == "patient_case" || module == "tentative_diagnosis" || module == "diagnostic_basis" || module == "differential_diagnosis" || module == "treatment_plan" || module == "sick_history" {
+	if module == "education" || module == "summary" || module == "course_disease" || module == "rescue_record" || module == "nursing_record" || module == "special_record" || module == "special_treatment" || module == "template_summary" || module == "template_plan" || module == "admitting_diagnosis" || module == "discharge_diagnosis" || module == "diagnosis_admission" || module == "treatment" || module == "illness_discharge" || module == "discharge_advice" || module == "dialysis_remark" || module == "catheter_operation" || module == "main_content" || module == "patient_case" || module == "tentative_diagnosis" || module == "diagnostic_basis" || module == "differential_diagnosis" || module == "treatment_plan" || module == "sick_history" || module == "befor_symptoms" {
 		if configBody["title"] == nil || reflect.TypeOf(configBody["title"]).String() != "string" {
 			utils.ErrorLog("title")
 			code = enums.ErrorCodeParamWrong

controllers/dialysis_api_controller.go

@@ -343,6 +343,7 @@ func (c *DialysisApiController) PostPrescription() {
 	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	prescription_water, _ := c.GetFloat("prescription_water")
 	dialysis_strainer := c.GetString("dialysis_strainer")
+	chaptalization := c.GetString("chaptalization")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.CurrentOrgId)
 
@@ -460,6 +461,7 @@ func (c *DialysisApiController) PostPrescription() {
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
+		Chaptalization:             chaptalization,
 	}
 
 	//长沙南雅医院，自动生成抗凝剂的临时处方
@@ -859,6 +861,7 @@ func (c *DialysisApiController) PostSoulution() {
 	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	prescription_water, _ := c.GetFloat("prescription_water")
 	dialysis_strainer := c.GetString("dialysis_strainer")
+	chaptalization := c.GetString("chaptalization")
 	var prescription_doctor int64
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
 
@@ -1002,6 +1005,7 @@ func (c *DialysisApiController) PostSoulution() {
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
+		Chaptalization:             chaptalization,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -1182,6 +1186,7 @@ func (c *DialysisApiController) PostSoulution() {
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 		PrescriptionWater:          prescribing_number,
 		DialysisStrainer:           dialysis_strainer,
+		Chaptalization:             chaptalization,
 	}
 
 	//针对河间咸得
@@ -1915,6 +1920,23 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 	his_department := c.GetString("his_department")
 	his_bed := c.GetString("his_bed")
 	point_puncture := c.GetString("point_puncture")
+
+	catheter_evaluation_program := c.GetString("catheter_evaluation_program")
+	skin_site_catheterization := c.GetString("skin_site_catheterization")
+	pathway_formation_time := c.GetString("pathway_formation_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(pathway_formation_time) > 0 {
+		theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", pathway_formation_time+" 00:00:00", loc)
+		startTime = theTime.Unix()
+	}
+	whether_unobstructed, _ := c.GetInt64("whether_unobstructed")
+
+	lien_necessary, _ := c.GetInt64("lien_necessary")
+
+	befor_symptoms := c.GetString("befor_symptoms")
+
 	assessmentBeforeDislysis := models.PredialysisEvaluation{
 		DialysisCount:                  dialysis_count,
 		EmergencyTreatment:             emergency_treatment,
@@ -1989,6 +2011,12 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		HisDepartment:                  his_department,
 		HisBed:                         his_bed,
 		PointPuncture:                  point_puncture,
+		CatheterEvaluationProgram:      catheter_evaluation_program,
+		SkinSiteCatheterization:        skin_site_catheterization,
+		PathwayFormationTime:           startTime,
+		WhetherUnobstructed:            whether_unobstructed,
+		LienNecessary:                  lien_necessary,
+		BeforSymptoms:                  befor_symptoms,
 	}
 
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
@@ -3583,6 +3611,11 @@ func (c *DialysisApiController) GetDialysisOrder() {
 
 	project_config, _ := service.GetHisProjectConfig(adminUserInfo.CurrentOrgId)
 	projects, _ := service.FindAllHisProjectById(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
+	//获取诊断
+	prescriptionInfo, _ := service.GetPrescriptionInfo(adminUserInfo.CurrentOrgId, patientInfo.ID, xttime)
+
+	patientDiagnose, _ := service.FindPatientDianose(adminUserInfo.CurrentOrgId)
 	//if config.IsOpen == 1 && project_config.IsOpen == 1 && len(projects) > 0 {
 	//	for _, item := range projects {
 	//		var advice *models.HisDoctorAdviceInfo
@@ -3638,6 +3671,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"last_order":                lastOrder,
 			"project_config":            project_config,
 			"projects":                  projects,
+			"prescriptionInfo":          prescriptionInfo,
+			"patientDiagnose":           patientDiagnose,
 		})
 
 	}
@@ -3675,6 +3710,8 @@ func (c *DialysisApiController) GetDialysisOrder() {
 			"last_order":                lastOrder,
 			"project_config":            project_config,
 			"projects":                  projects,
+			"prescriptionInfo":          prescriptionInfo,
+			"patientDiagnose":           patientDiagnose,
 		})
 	}
 
@@ -4039,10 +4076,12 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		return
 	}
 	theTimeUnix, err := time.ParseInLocation(timeLayout, startTime, loc)
-	if err != nil {
-		utils.ErrorLog(err.Error())
-		return
-	}
+
+	fmt.Println("theTimeUnix", theTimeUnix.Unix())
+	//if err != nil {
+	//	utils.ErrorLog(err.Error())
+	//	return
+	//}
 	StartTime := theTimeUnix.Unix()
 	fmt.Println("startTIME", StartTime)
 	Remark := ""
@@ -4062,7 +4101,11 @@ func (c *DialysisApiController) CreateRemindDoctorAdvice() {
 		var advice models.GroupAdvice
 		advice.Remark = Remark
 		advice.AdviceType = adviceType
+
 		advice.StartTime = StartTime
+		if StartTime < 0 {
+			advice.StartTime = time.Now().Unix()
+		}
 		advice.AdviceDate = AdviceDate
 
 		advice.RecordDate = RecordDate
@@ -6216,6 +6259,7 @@ func (this *DialysisApiController) GetDialysisPatientsFlow() {
 
 	} else {
 		dialysisSchedule, err, total := service.GetDialysisWatchFlow(adminUserInfo.CurrentOrgId, startTime/1000, schedulType, partitionType, page, limit, start_time/1000, end_time/1000)
+		fmt.Println("dialysisSchedule-----------------------", dialysisSchedule)
 		if err == nil {
 			this.ServeSuccessJSON(map[string]interface{}{
 				"schedule": dialysisSchedule,

controllers/drug_stock_api_contorller.go

@@ -3538,8 +3538,10 @@ func (c *StockDrugApiController) CheckWarehousingInfo() {
 	warehousing_id, _ := c.GetInt64("warehousing_id")
 	orgId := c.GetAdminUserInfo().CurrentOrgId
 	houseConfig, _ := service.GetAllStoreHouseConfig(orgId)
+
+	checker := c.GetAdminUserInfo().AdminUser.Id
 	//更改核对状态
-	err := service.CheckWarehousingInfo(warehousing_id, orgId)
+	err := service.CheckWarehousingInfo(warehousing_id, orgId, checker)
 
 	if err == nil {
 		list, _ := service.GetWarehousingInfoByList(warehousing_id, orgId)

controllers/his_api_controller.go

@@ -1461,6 +1461,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		diagnose, _ := service.FindAllDiagnose(adminInfo.CurrentOrgId)
 		additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
 
+		patientDiagnose, _ := service.FindPatientDianose(adminInfo.CurrentOrgId)
 		//获取是否开启保存耗材出库的开关
 		goodOutOpen, _ := service.GetGoodOutOpenConfigOne(adminInfo.CurrentOrgId)
 		c.ServeSuccessJSON(map[string]interface{}{
@@ -1475,6 +1476,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 			"diagnose":         diagnose,
 			"manufacturers":    manufacturers,
 			"goodOutOpen":      goodOutOpen,
+			"patientDiagnose":  patientDiagnose,
 		})
 	}
 	if adminInfo.CurrentOrgId != 9675 && adminInfo.CurrentOrgId != 9671 && adminInfo.CurrentOrgId != 10215 {
@@ -1507,7 +1509,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 		additions, _ := service.FindAllAddition(adminInfo.CurrentOrgId)
 		//获取是否开启保存耗材出库的开关
 		goodOutOpen, _ := service.GetGoodOutOpenConfigOne(adminInfo.CurrentOrgId)
-
+		patientDiagnose, _ := service.FindPatientDianose(adminInfo.CurrentOrgId)
 		c.ServeSuccessJSON(map[string]interface{}{
 			"drugs":            drugs,
 			"advices_template": advices,
@@ -1520,6 +1522,7 @@ func (c *HisApiController) GetHisPrescriptionConfig() {
 			"diagnose":         diagnose,
 			"manufacturers":    manufacturers,
 			"goodOutOpen":      goodOutOpen,
+			"patientDiagnose":  patientDiagnose,
 		})
 	}
 }
@@ -1536,6 +1539,8 @@ func (c *HisApiController) CreateHisPrescription() {
 	his_patient_id, _ := c.GetInt64("his_patient_id")
 
 	p_type, _ := c.GetInt64("p_type")
+	patient_diagnose := c.GetString("patient_diagnose")
+
 	dataBody := make(map[string]interface{}, 0)
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -2628,6 +2633,7 @@ func (c *HisApiController) CreateHisPrescription() {
 			DoctorId:           doctor_id,
 			SickType:           sick_type,
 			PType:              p_type,
+			PatientDiagnosis:   patient_diagnose,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 		redis := service.RedisClient()
@@ -2660,6 +2666,7 @@ func (c *HisApiController) CreateHisPrescription() {
 			SickType:           sick_type,
 			PType:              info.PType,
 			HisPatientId:       info.HisPatientId,
+			PatientDiagnosis:   patient_diagnose,
 		}
 		service.SavePatientPrescriptionInfo(hpInfo)
 		redis := service.RedisClient()
@@ -3004,6 +3011,8 @@ func (c *HisApiController) CreateHisPrescription() {
 
 		//查询今日该患者开的药品处方
 		hisdoctorlist, _ := service.GetHisAdviceListByDrugIdTwo(patient_id, recordDateTime, adminInfo.CurrentOrgId)
+
+		fmt.Println("今日出库2333333333333333333333333333333333333333")
 		drugOutConfig, _ := service.GetDrugOpenConfigOne(adminInfo.CurrentOrgId)
 		//药品出库
 		if drugOutConfig.IsOpen == 1 {
@@ -3012,7 +3021,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 				// 查询该药品最后一次出库记录
 				druginfo, _ := service.GetLastDrugWarehouseOutByDrugIdTwenty(item.DrugId, patient_id, recordDateTime, item.ID)
-
+				fmt.Println("今日最后出库2333333333333333333333333333333333333333", druginfo)
 				if len(druginfo) > 0 {
 					//回退库存
 					for _, it := range druginfo {
@@ -3023,6 +3032,7 @@ func (c *HisApiController) CreateHisPrescription() {
 
 						}
 						if it.CountUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+
 							service.ModifyDrugWarehouseInfoStockMinNumber(it.Count, it.DrugId, it.OrgId, it.WarehouseInfoId)
 
 						}

controllers/his_hospital_api_controller.go

@@ -40,6 +40,35 @@ func HisHospitalManagerApiRegistRouters() {
 
 	beego.Router("/api/exportuncharge/get", &HisHospitalApiController{}, "get:GetExportHisHospitalUnChargeData")
 
+	beego.Router("/api/hospital/inhopitalcheck/list", &HisHospitalApiController{}, "get:GetZHInHospitalCheckList")
+
+}
+func (this *HisHospitalApiController) GetZHInHospitalCheckList() {
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	keyword := this.GetString("keyword")
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	limit, _ := this.GetInt64("limit")
+	page, _ := this.GetInt64("page")
+	startTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", start_time+":00", loc)
+	endTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", end_time+":59", loc)
+	adminUserInfo := this.GetAdminUserInfo()
+	orgId := adminUserInfo.CurrentOrgId
+	history, total, err := service.GetHisInHospitalHistory(keyword, startTime.Unix(), endTime.Unix(), limit, page, orgId)
+	department, err := service.GetAllDepartMent(orgId)
+	appId := adminUserInfo.CurrentAppId
+	doctor, err := service.GetAllDoctor(orgId, appId)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeUpdateConfig)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"history":    history,
+		"total":      total,
+		"department": department,
+		"doctor":     doctor,
+	})
 }
 func (c *HisHospitalApiController) RefundDetail() {
 	patient_id, _ := c.GetInt64("patient_id")

controllers/manage_api_controller.go

@@ -957,16 +957,16 @@ func (this *MachineApiController) GetPatient() {
 func (this *MachineApiController) GetAllOrganization() {
 	adminUserInfo := this.GetAdminUserInfo()
 	orgid := adminUserInfo.CurrentOrgId
-	//fmt.Println("orgid", orgid)
 	appid := adminUserInfo.CurrentAppId
-	//fmt.Println("appid", appid)
 	approle, err := service.GetAllOrganization(orgid, appid)
+	operators, err := service.GetAdminUserEsOne(adminUserInfo.CurrentOrgId)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询失败:（"+err.Error()+"）")
 		return
 	}
 	this.ServeSuccessJSON(map[string]interface{}{
-		"approle": approle,
+		"approle":   approle,
+		"operators": operators,
 	})
 }
 
@@ -2670,7 +2670,6 @@ func (this *MachineApiController) GetBedForm() {
 	fmt.Println("id", id)
 	addmacher, err := service.GetZoneForm(id)
 	bed, err := service.GetZoneId(addmacher.BedId, orgId)
-	fmt.Println("bed--------------------", bed.ZoneID)
 	number, err := service.GetBedForm(bed.ZoneID)
 	if err != nil {
 		this.ServeFailJsonSend(enums.ErrorCodeDBDelete, "查询:（"+err.Error()+"）")

controllers/manager_center_api_controller.go

@@ -83,6 +83,11 @@ func ManagerCenterRegistRouters() {
 	beego.Router("/api/drug/getalldruglist", &ManagerCenterApiController{}, "get:GetAllDrugList")
 	beego.Router("/api/drug/postsearchdruglist", &ManagerCenterApiController{}, "get:GetSearchDrugList")
 
+	beego.Router("/api/patient/addpatientdiagnose", &ManagerCenterApiController{}, "Post:AddPatientDiagnos")
+	beego.Router("/api/patient/getpatientdiagnose", &ManagerCenterApiController{}, "Get:GetPatientDiagnose")
+	beego.Router("/api/patient/getpatientdiagnosedetail", &ManagerCenterApiController{}, "Get:GetPatientDiagnoseDetail")
+	beego.Router("/api/patient/updatepatientcase", &ManagerCenterApiController{}, "Post:UpdatePatientCase")
+	beego.Router("/api/patient/deletepatientdiagnose", &ManagerCenterApiController{}, "Get:DeletePatientDiagnose")
 }
 
 func (c *ManagerCenterApiController) CreateBaseDrugLib() {
@@ -825,7 +830,7 @@ func (c *ManagerCenterApiController) UpdateChildConfig() {
 	dataconfig.Remark = string(dataBody["remark"].(string))
 	dataconfig.Order = int64(dataBody["orders"].(float64))
 	dataconfig.Code = string(dataBody["code"].(string))
-	fmt.Println("dataconfitg------", dataconfig.Order)
+
 	//if dataBody["orders"] != nil {
 	//	dataconfig.Order = int64(dataBody["orders"].(float64))
 	//	fmt.Println("dataconfig",dataconfig.Order)
@@ -2314,3 +2319,98 @@ func (c *ManagerCenterApiController) GetSearchDrugList() {
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
 	}
 }
+
+func (c *ManagerCenterApiController) AddPatientDiagnos() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+
+	class_name := dataBody["class_name"].(string)
+	sort := int64(dataBody["sort"].(float64))
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+	diagnose := models.XtPatientDiagnose{
+		ClassName: class_name,
+		Sort:      sort,
+		UserOrgId: orgId,
+		Status:    1,
+		Ctime:     time.Now().Unix(),
+		Mtime:     0,
+	}
+
+	err = service.CreatePatientDiagnose(diagnose)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"diagnose": diagnose,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *ManagerCenterApiController) GetPatientDiagnose() {
+
+	limit, _ := c.GetInt64("limit")
+	page, _ := c.GetInt64("page")
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	list, total, err := service.GetPatientDiagnose(limit, page, orgId)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"list":  list,
+			"total": total,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *ManagerCenterApiController) GetPatientDiagnoseDetail() {
+
+	id, _ := c.GetInt64("id")
+
+	detail, err := service.GetPatientDiagnoseDetail(id)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"detail": detail,
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *ManagerCenterApiController) UpdatePatientCase() {
+
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
+
+	class_name := dataBody["class_name"].(string)
+	sort := int64(dataBody["sort"].(float64))
+
+	id := int64(dataBody["id"].(float64))
+
+	err = service.UpdatePatientCase(class_name, sort, id)
+
+	if err == nil {
+		c.ServeSuccessJSON(map[string]interface{}{
+			"msg": "msg",
+		})
+	} else {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+	}
+}
+
+func (c *ManagerCenterApiController) DeletePatientDiagnose() {
+
+	id, _ := c.GetInt64("id")
+
+	service.DeletePatientDiagnose(id)
+
+	returnData := make(map[string]interface{}, 0)
+	returnData["msg"] = "ok"
+	c.ServeSuccessJSON(returnData)
+	return
+}

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -1499,6 +1499,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	prescription_water, _ := c.GetFloat("prescription_water")
 	dialysis_strainer := c.GetString("dialysis_strainer")
+	chaptalization := c.GetString("chaptalization")
 	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.Org.Id, adminUserInfo.AdminUser.Id, adminUserInfo.App.Id)
 
 	//template, _ := service.GetOrgInfoTemplate(adminUserInfo.Org.Id)
@@ -1633,6 +1634,7 @@ func (c *DialysisAPIController) PostDialysisPrescription() {
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
+		Chaptalization:             chaptalization,
 	}
 
 	//查询最近透析准备表里是否存在 透析器 灌流器
@@ -2141,6 +2143,11 @@ func (c *DialysisAPIController) Finish() {
 			tempassessmentAfterDislysis.Temperature = endmonitorRecords.Temperature
 		}
 
+		//阳春
+		if adminUserInfo.Org.Id == 10485 {
+			tempassessmentAfterDislysis.ActualUltrafiltration = endmonitorRecords.UltrafiltrationVolume / 1000
+		}
+
 	}
 
 	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 {
@@ -2308,6 +2315,9 @@ func (c *DialysisAPIController) Finish() {
 		tempassessmentAfterDislysis.BloodFlow = lastAssessmentAfterDislysis.BloodFlow
 		tempassessmentAfterDislysis.SealingFluidDispose = lastAssessmentAfterDislysis.SealingFluidDispose
 		tempassessmentAfterDislysis.SealingFluidSpecial = lastAssessmentAfterDislysis.SealingFluidSpecial
+		if tempassessmentAfterDislysis.PatientId == 18695 {
+			tempassessmentAfterDislysis.ActualDisplacement = 0
+		}
 
 	}
 
@@ -2353,7 +2363,7 @@ func (c *DialysisAPIController) Finish() {
 
 		//下机完自动消毒,针对长沙南雅
 		if dialysisOrder.Stage == 1 {
-			if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 {
+			if adminUserInfo.Org.Id == 9671 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 9538 {
 				//根据床位号获取设备型号
 				unitType, _ := service.GetUnitType(dialysisOrder.BedID, dialysisOrder.UserOrgId)
 				//查询使用消毒最后一条消毒记录
@@ -3078,6 +3088,7 @@ func (c *DialysisAPIController) PostSolution() {
 	sodium_bicarbonate_flow := c.GetString("sodium_bicarbonate_flow")
 	prescription_water, _ := c.GetFloat("prescription_water")
 	dialysis_strainer := c.GetString("dialysis_strainer")
+	chaptalization := c.GetString("chaptalization")
 	if mode_id > 0 {
 
 		var str string
@@ -3210,6 +3221,7 @@ func (c *DialysisAPIController) PostSolution() {
 		SodiumBicarbonateFlow:      sodium_bicarbonate_flow,
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
+		Chaptalization:             chaptalization,
 	}
 
 	_, dialysisPrescription := service.FindDialysisPrescriptionByReordDate(id, recordDate.Unix(), adminUserInfo.Org.Id)
@@ -3324,6 +3336,7 @@ func (c *DialysisAPIController) PostSolution() {
 		DialysisFluidFlow:          dialysis_fluid_flow,
 		PrescriptionWater:          prescription_water,
 		DialysisStrainer:           dialysis_strainer,
+		Chaptalization:             chaptalization,
 	}
 
 	//针对河间咸的

controllers/mobile_api_controllers/mobile_api_base_controller.go

@@ -189,7 +189,6 @@ func (this *MobileBaseAPIAuthController) Prepare() {
 
 			//系统所记录的权限列表
 			allPermission, _ := service.GetAllFunctionPurview()
-			fmt.Println("allPermission-----------------------", allPermission)
 			for _, item := range allPermission {
 				//判断当前路由是否在权限路由列表里面
 				if strings.Split(item.Urlfor, ",")[0] == strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode") {

controllers/mobile_api_controllers/patient_api_controller.go

@@ -552,8 +552,6 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 	origin, _ := c.GetInt64("origin", 0)
 	groupno, _ := c.GetInt64("groupno", -1)
 
-	fmt.Println("orgind===2=323322323232323", origin)
-	fmt.Println("groupno233333333333333333333", groupno)
 	if origin != 2 {
 		adminUserInfo := c.GetMobileAdminUserInfo()
 		execution_staff := adminUserInfo.AdminUser.Id
@@ -621,7 +619,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			UpdatedTime:    time.Now().Unix(),
 		}
 		var err error
-		fmt.Println("groupno==============", groupno)
+
 		if groupno > 0 {
 			err = service.ExceDoctorAdviceByGroupNo(&advices, groupno, adminUserInfo.Org.Id)
 			key := strconv.FormatInt(adminUserInfo.Org.Id, 10) + ":" + strconv.FormatInt(advice.PatientId, 10) + ":" + strconv.FormatInt(advice.AdviceDate, 10) + ":doctor_advices"
@@ -1448,22 +1446,22 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					}
 
 					//
-					if config.IsOpen == 1 && item.UserOrgId == 10028 {
-
-						service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
-						//更新字典里面的库存
-						stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
-						var sum_count int64
-						for _, its := range stockInfo {
-							if its.MaxUnit == medical.MaxUnit {
-								its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
-							}
-							sum_count += its.StockMaxNumber + its.StockMinNumber
-						}
-						service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
-						//剩余库存
-						service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
-					}
+					//if config.IsOpen == 1 && item.UserOrgId == 10188 {
+					//
+					//	service.HisDrugsDelivery(adminInfo.Org.Id, creater, &advice)
+					//	//更新字典里面的库存
+					//	stockInfo, _ := service.GetDrugAllStockInfo(storeHouseConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId)
+					//	var sum_count int64
+					//	for _, its := range stockInfo {
+					//		if its.MaxUnit == medical.MaxUnit {
+					//			its.StockMaxNumber = its.StockMaxNumber * medical.MinNumber
+					//		}
+					//		sum_count += its.StockMaxNumber + its.StockMinNumber
+					//	}
+					//	service.UpdateBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId)
+					//	//剩余库存
+					//	service.UpdateDrugStockCount(item.DrugId, item.UserOrgId, storeHouseConfig.DrugStorehouseOut, sum_count)
+					//}
 
 				}
 			}
@@ -3074,6 +3072,49 @@ func predialysisEvaluationFormData(evaluation *models.PredialysisEvaluation, dat
 
 		evaluation.PointPuncture = point_puncture
 	}
+
+	if dataBody["catheter_evaluation_program"] != nil && reflect.TypeOf(dataBody["catheter_evaluation_program"]).String() == "string" {
+		catheter_evaluation_program := dataBody["catheter_evaluation_program"].(string)
+
+		evaluation.CatheterEvaluationProgram = catheter_evaluation_program
+	}
+
+	if dataBody["skin_site_catheterization"] != nil && reflect.TypeOf(dataBody["skin_site_catheterization"]).String() == "string" {
+		skin_site_catheterization := dataBody["skin_site_catheterization"].(string)
+
+		evaluation.SkinSiteCatheterization = skin_site_catheterization
+	}
+
+	if dataBody["whether_unobstructed"] != nil && reflect.TypeOf(dataBody["whether_unobstructed"]).String() == "float64" {
+		whether_unobstructed := int64(dataBody["whether_unobstructed"].(float64))
+		evaluation.WhetherUnobstructed = whether_unobstructed
+	}
+
+	if dataBody["lien_necessary"] != nil && reflect.TypeOf(dataBody["lien_necessary"]).String() == "float64" {
+		lien_necessary := int64(dataBody["lien_necessary"].(float64))
+		evaluation.LienNecessary = lien_necessary
+	}
+
+	if dataBody["pathway_formation_time"] != nil && reflect.TypeOf(dataBody["pathway_formation_time"]).String() == "string" {
+		pathway_formation_time := dataBody["pathway_formation_time"].(string)
+		timeLayout := "2006-01-02"
+		loc, _ := time.LoadLocation("Local")
+		var startTime int64
+		if len(pathway_formation_time) > 0 {
+			theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", pathway_formation_time+" 00:00:00", loc)
+
+			startTime = theTime.Unix()
+		}
+
+		evaluation.PathwayFormationTime = startTime
+	}
+
+	if dataBody["befor_symptoms"] != nil && reflect.TypeOf(dataBody["befor_symptoms"]).String() == "string" {
+		befor_symptoms := dataBody["befor_symptoms"].(string)
+		evaluation.BeforSymptoms = befor_symptoms
+
+		fmt.Println("befor_symptomsss23333333333333333333333333", befor_symptoms)
+	}
 	return
 }
 

controllers/patient_api_controller.go

@@ -366,6 +366,7 @@ func (c *PatientApiController) CreatePatient() {
 		TrobleShoot:                  patient.TrobleShoot,
 		TreatmentPlan:                patient.TreatmentPlan,
 		Doctor:                       patient.Doctor,
+		RecordNumber:                 patient.RecordNumber,
 	}
 
 	err = service.CreatePatientsNew(&patientsNew)
@@ -582,6 +583,7 @@ func (c *PatientApiController) EditPatient() {
 		TrobleShoot:               patient.TrobleShoot,
 		SchRemark:                 patient.SchRemark,
 		TreatmentPlan:             patient.TreatmentPlan,
+		RecordNumber:              patient.RecordNumber,
 	}
 	//	//更新病人ID获取新表病人ID
 	err = service.UpdatepatientTwo(&patientsNew, id)
@@ -939,6 +941,7 @@ func (c *PatientApiController) UpdateDialysisSolution() {
 			MaxUltrafiltrationRate:     solution.MaxUltrafiltrationRate,
 			Amylaceum:                  solution.Amylaceum,
 			DialysisStrainer:           solution.DialysisStrainer,
+			Chaptalization:             solution.Chaptalization,
 		}
 		service.UpdatePatientDialysisSolutionOne(solution.PatientId, adminUserInfo.CurrentOrgId, &prescription, todayTime.Unix())
 	}
@@ -3262,11 +3265,15 @@ func (c *PatientApiController) GetDoctorAdvices() {
 		//相关操作对应的操作人
 		operators, _ := service.GetAdminUserES(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, operatorIDs)
 
+		//获取长期医嘱
+		longAdvice, _, _ := service.GetLongDoctorAdviceList(adminUserInfo.CurrentOrgId, id, 1, stopType, theStartTIme, theEndtTIme, keywords, page, limit)
 		c.ServeSuccessJSON(map[string]interface{}{
-			"advices":   advices,
-			"operators": operators,
-			"total":     total,
-			"advicetwo": advicestwo,
+			"advices":    advices,
+			"operators":  operators,
+			"total":      total,
+			"advicetwo":  advicestwo,
+			"longAdvice": longAdvice,
+			"is_open":    hisconfig.IsOpen,
 		})
 		return
 	} else {
@@ -3298,6 +3305,7 @@ func (c *PatientApiController) GetDoctorAdvices() {
 			"operators": operators,
 			"total":     total,
 			"advicetwo": advicestwo,
+			"is_open":   hisconfig.IsOpen,
 		})
 		return
 	}
@@ -4071,6 +4079,11 @@ func defaultSolutionFormData(solution *models.DialysisSolution, data []byte, met
 		amylaceum := dataBody["amylaceum"].(string)
 		solution.Amylaceum = amylaceum
 	}
+
+	if dataBody["chaptalization"] != nil && reflect.TypeOf(dataBody["chaptalization"]).String() == "string" {
+		chaptalization := dataBody["chaptalization"].(string)
+		solution.Chaptalization = chaptalization
+	}
 	return
 }
 
@@ -4682,6 +4695,11 @@ func patientFormData(patient *models.Patients, data []byte, method string) (cont
 		doctor := int64(patientBody["doctor"].(float64))
 		patient.Doctor = doctor
 	}
+
+	if patientBody["record_number"] != nil && reflect.TypeOf(patientBody["record_number"]).String() == "string" {
+		record_number := patientBody["record_number"].(string)
+		patient.RecordNumber = record_number
+	}
 	return
 }
 

controllers/patient_dataconfig_api_controller.go

@@ -36,6 +36,8 @@ func PatientDataConfigAPIControllerRegistRouters() {
 	beego.Router("/api/patient/sickhistory/print", &PatientDataConfigAPIController{}, "get:GetSickhistoryPrints")
 	beego.Router("/api/patient/physiquecheck/print", &PatientDataConfigAPIController{}, "get:GetPhysiquecheckPrints")
 
+	beego.Router("/api/patient/getpatientdialysisinforlist", &PatientDataConfigAPIController{}, "get:GetPatientDialysisInforList")
+
 }
 
 type PatientDataConfigAPIController struct {
@@ -1000,7 +1002,6 @@ func (this *PatientDataConfigAPIController) ModifyCourse() {
 	//loc, _ := time.LoadLocation("Local")
 	checkDate, _ := utils.ParseTimeStringToTime("2006-01-02 15:04:05", record_time_str)
 
-	fmt.Println("checkDate--------------", checkDate)
 	adminUserInfo := this.GetAdminUserInfo()
 	patient, getPatientErr := service.GetPatientByID(adminUserInfo.CurrentOrgId, patientID)
 	if getPatientErr != nil {
@@ -1038,3 +1039,54 @@ func (this *PatientDataConfigAPIController) ModifyCourse() {
 		"record": record,
 	})
 }
+
+func (this *PatientDataConfigAPIController) GetPatientDialysisInforList() {
+
+	patientID, _ := this.GetInt64("patient_id")
+	record_date := this.GetString("record_date")
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	var startTime int64
+	if len(record_date) > 0 {
+		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", record_date+" 00:00:00", loc)
+		if err != nil {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+			return
+		}
+		startTime = theTime.Unix()
+	}
+	fmt.Println("startTime0000000000000000", startTime)
+
+	//获取患者姓名
+	patient, _ := service.GetPatientName(patientID)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	//获取透析处方
+	prescription, _ := service.GetDialysisPrescription(patientID, orgId, startTime)
+
+	//获取透前评估
+	assessmentBefor, _ := service.GetAssessmentBefor(orgId, patientID, startTime)
+
+	//透析上机
+	order, _ := service.GetDialysisOrder(orgId, patientID, startTime)
+
+	//透析监测
+	monitor, _ := service.GetFistMonitorSix(orgId, patientID, startTime)
+
+	//透析医嘱
+	advice, _ := service.GetBloodDoctorAdvice(startTime, orgId, patientID)
+
+	//透后评估
+	afterDislysis, _ := service.GetAssessmentAfterDissData(patientID, orgId, startTime)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient":         patient,
+		"prescription":    prescription,
+		"assessmentBefor": assessmentBefor,
+		"order":           order,
+		"monitor":         monitor,
+		"advice":          advice,
+		"afterDislysis":   afterDislysis,
+	})
+}

controllers/pharmacy_controller.go

@@ -438,7 +438,7 @@ func (this *PharmacyController) DispensingMedicine() {
 
 // 退药按钮点击
 func (this *PharmacyController) DrugWithdrawal() {
-	fmt.Println("寄哪里2333333333333333333333333333333")
+
 	var err error
 	defer func() {
 		if rec := recover(); rec != nil {

controllers/print_data_api_controller.go

@@ -37,7 +37,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 	idStrs := strings.Split(schIDStr, ",")
 	adminUserInfo := this.GetAdminUserInfo()
 
-	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 {
+	if this.GetAdminUserInfo().CurrentOrgId == 10016 || this.GetAdminUserInfo().CurrentOrgId == 9882 || this.GetAdminUserInfo().CurrentOrgId == 10138 || this.GetAdminUserInfo().CurrentOrgId == 10278 || this.GetAdminUserInfo().CurrentOrgId == 9841 || this.GetAdminUserInfo().CurrentOrgId == 9845 || this.GetAdminUserInfo().CurrentOrgId == 10081 || this.GetAdminUserInfo().CurrentOrgId == 10215 || this.GetAdminUserInfo().CurrentOrgId == 10121 || this.GetAdminUserInfo().CurrentOrgId == 10234 || this.GetAdminUserInfo().CurrentOrgId == 10188 || this.GetAdminUserInfo().CurrentOrgId == 10217 || this.GetAdminUserInfo().CurrentOrgId == 10340 || this.GetAdminUserInfo().CurrentOrgId == 9905 || this.GetAdminUserInfo().CurrentOrgId == 10346 || this.GetAdminUserInfo().CurrentOrgId == 10441 {
 		schedules, getScheduleErr := service.GetSchedulesSeven(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 
@@ -136,7 +136,7 @@ func (this *PrintDataAPIController) ScheduleDialysisRecordPrintData() {
 		})
 	}
 
-	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 {
+	if this.GetAdminUserInfo().CurrentOrgId != 10016 && this.GetAdminUserInfo().CurrentOrgId != 9882 && this.GetAdminUserInfo().CurrentOrgId != 10138 && this.GetAdminUserInfo().CurrentOrgId != 10278 && this.GetAdminUserInfo().CurrentOrgId != 9841 && this.GetAdminUserInfo().CurrentOrgId != 9845 && this.GetAdminUserInfo().CurrentOrgId != 10081 && this.GetAdminUserInfo().CurrentOrgId != 10215 && this.GetAdminUserInfo().CurrentOrgId != 10121 && this.GetAdminUserInfo().CurrentOrgId != 10234 && this.GetAdminUserInfo().CurrentOrgId != 10188 && this.GetAdminUserInfo().CurrentOrgId != 10217 && this.GetAdminUserInfo().CurrentOrgId != 10340 && this.GetAdminUserInfo().CurrentOrgId != 9905 && this.GetAdminUserInfo().CurrentOrgId != 10346 && this.GetAdminUserInfo().CurrentOrgId != 10441 {
 		schedules, getScheduleErr := service.GetSchedules(adminUserInfo.CurrentOrgId, idStrs)
 		for _, item := range schedules {
 			list, _ := service.GetDialysisOrderCountSeven(item.PatientID, item.ScheduleDate)

controllers/schedule_api_controller.go

@@ -4394,6 +4394,18 @@ func (c *ScheduleApiController) GetScheduleOne() {
 		weekEndPoint = theEndTime.Unix()
 	}
 	schdules, _ := service.GetWeekScheduleTwo(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
+
+	if adminInfo.CurrentOrgId == 9671 || adminInfo.CurrentOrgId == 10346 {
+
+		if len(schdules) > 0 {
+			//获取长期医嘱里面的透析器灌流器
+			for _, item := range schdules {
+				solution, _ := service.GetLongSolutionByModeId(item.PatientId, item.ModeId, item.UserOrgId)
+				service.UpdateScheduleByDialysis(item.PatientId, item.ModeId, item.ScheduleDate, item.UserOrgId, solution.DialyzerPerfusionApparatus, item.ScheduleType)
+			}
+
+		}
+	}
 	schedulesGroup, _ := service.GetScheduleTotalCount(adminInfo.CurrentOrgId, weekStartPoint, weekEndPoint, ids, schedule_type)
 	c.ServeSuccessJSON(map[string]interface{}{
 		"days":           days,
@@ -4408,6 +4420,8 @@ func (c *ScheduleApiController) GetScheduleOne() {
 func (c *ScheduleApiController) GetScheduleTwo() {
 
 	week, _ := c.GetInt64("weekTime", 0) //1:last, 2:this 3:next 4 nextTwo
+
+	fmt.Println("weekwoowowowowowowowowowo", week)
 	patitionIdStr := c.GetString("patitionid")
 
 	ids := strings.Split(patitionIdStr, ",")
@@ -4416,6 +4430,7 @@ func (c *ScheduleApiController) GetScheduleTwo() {
 
 	adminInfo := c.GetAdminUserInfo()
 	weekDateStr := c.GetString("week_date")
+	fmt.Println("weekDateStr--------------------", weekDateStr)
 	WeekDayIds := strings.Split(weekDateStr, ",")
 
 	thisTime := time.Now()

controllers/stock_in_api_controller.go

@@ -7433,8 +7433,9 @@ func (this *StockManagerApiController) CheckWarehouseInfo() {
 	//查询默认仓库
 	storeHouseConfig, _ := service.GetAllStoreHouseConfig(orgId)
 
+	checker := this.GetAdminUserInfo().AdminUser.Id
 	//更改审核状态
-	err := service.UpdateCheckWarehouseInfo(warehousing_info_id)
+	err := service.UpdateCheckWarehouseInfo(warehousing_info_id, checker)
 	if err == nil {
 		list, _ := service.GetWarehouseInfoList(warehousing_info_id, orgId)
 

models/data_models.go

@@ -192,3 +192,17 @@ type XtHisAddtionConfig struct {
 func (XtHisAddtionConfig) TableName() string {
 	return "xt_his_addtion_config"
 }
+
+type XtPatientDiagnose struct {
+	ID        int64  `gorm:"column:id" json:"id" form:"id"`
+	ClassName string `gorm:"column:class_name" json:"class_name" form:"class_name"`
+	Sort      int64  `gorm:"column:sort" json:"sort" form:"sort"`
+	UserOrgId int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Status    int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime     int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+}
+
+func (XtPatientDiagnose) TableName() string {
+	return "xt_patient_diagnose"
+}

models/dialysis.go

@@ -160,6 +160,7 @@ type SchedualPatient2 struct {
 	UserSysBeforeCount        int64                `gorm:"column:user_sys_before_count" json:"user_sys_before_count" form:"user_sys_before_count"`
 	SchRemark                 string               `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	HospitalFirstDialysisDate int64                `gorm:"column:hospital_first_dialysis_date" json:"hospital_first_dialysis_date" form:"hospital_first_dialysis_date"`
+	RecordNumber              string               `gorm:"column:record_number" json:"record_number" form:"record_number"`
 }
 
 func (SchedualPatient2) TableName() string {
@@ -326,6 +327,12 @@ type PredialysisEvaluation struct {
 	HisDepartment                  string  `gorm:"column:his_department" json:"his_department" form:"his_department"`
 	HisBed                         string  `gorm:"column:his_bed" json:"his_bed" form:"his_bed"`
 	PointPuncture                  string  `gorm:"column:point_puncture" json:"point_puncture" form:"point_puncture"`
+	CatheterEvaluationProgram      string  `gorm:"column:catheter_evaluation_program" json:"catheter_evaluation_program" form:"catheter_evaluation_program"`
+	SkinSiteCatheterization        string  `gorm:"column:skin_site_catheterization" json:"skin_site_catheterization" form:"skin_site_catheterization"`
+	WhetherUnobstructed            int64   `gorm:"column:whether_unobstructed" json:"whether_unobstructed" form:"whether_unobstructed"`
+	LienNecessary                  int64   `gorm:"column:lien_necessary" json:"lien_necessary" form:"lien_necessary"`
+	PathwayFormationTime           int64   `gorm:"column:pathway_formation_time" json:"pathway_formation_time" form:"pathway_formation_time"`
+	BeforSymptoms                  string  `gorm:"column:befor_symptoms" json:"befor_symptoms" form:"befor_symptoms"`
 }
 
 func (PredialysisEvaluation) TableName() string {

models/drug_stock.go

@@ -19,6 +19,7 @@ type DrugWarehouse struct {
 	SecondWarehouseId int64  `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
 	IsSys             int64  `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	IsCheck           int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Checker           int64  `gorm:"column:checker" json:"checker" form:"checker"`
 }
 
 func (DrugWarehouse) TableName() string {

models/his_models.go

@@ -422,6 +422,7 @@ type HisPrescriptionInfo struct {
 	XtHisDepartment    XtHisDepartment `gorm:"ForeignKey:ID;AssociationForeignKey:Departments" json:"department"`
 	SickType           int64           `gorm:"column:sick_type" json:"sick_type" form:"sick_type"`
 	PType              int64           `gorm:"column:p_type" json:"p_type" form:"p_type"`
+	PatientDiagnosis   string          `gorm:"column:patient_diagnosis" json:"patient_diagnosis" form:"patient_diagnosis"`
 }
 
 func (HisPrescriptionInfo) TableName() string {

models/patient_models.go

@@ -221,6 +221,7 @@ type Patients struct {
 	ZbPatientId              string  `gorm:"column:zb_patient_id" json:"zb_patient_id" form:"zb_patient_id"`
 	TreatmentPlan            string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 	Doctor                   int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
+	RecordNumber             string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
 }
 
 func (Patients) TableName() string {
@@ -366,6 +367,7 @@ type DialysisPrescription struct {
 	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"`
 }
 
 func (DialysisPrescription) TableName() string {
@@ -583,6 +585,7 @@ type DialysisSolution struct {
 	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"`
 }
 
 func (DialysisSolution) TableName() string {
@@ -810,6 +813,7 @@ type XtPatientsNew struct {
 	TreatmentPlan                string  `gorm:"column:treatment_plan" json:"treatment_plan" form:"treatment_plan"`
 	Doctor                       int64   `gorm:"column:doctor" json:"doctor" form:"doctor"`
 	ScheduleRemark               string  `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
+	RecordNumber                 string  `gorm:"column:record_number" json:"record_number" form:"record_number"`
 }
 
 func (XtPatientsNew) TableName() string {

models/stock_models.go

@@ -69,6 +69,7 @@ type Warehousing struct {
 	IsSys             int64        `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	SecondWarehouseId int64        `gorm:"column:second_warehouse_id" json:"second_warehouse_id" form:"second_warehouse_id"`
 	IsCheck           int64        `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Checker           int64        `gorm:"column:checker" json:"checker" form:"checker"`
 }
 
 func (Warehousing) TableName() string {

service/dialysis_service.go

@@ -1640,6 +1640,7 @@ func GetAllPcDialysisOrdersByList(orgID int64, scheduleDate int64) (dialysisOrde
 	redis := RedisClient()
 	defer redis.Close()
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(scheduleDate, 10) + ":dialysis_orders_list_all"
+
 	dialysis_orders_list_all, _ := redis.Get(key).Result()
 
 	if len(dialysis_orders_list_all) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
@@ -2205,17 +2206,12 @@ func GetDialysisWatchByKeywordFlow(orgID int64, keyword string, schedulType int6
 
 func GetDialysisWatchFlow(orgID int64, schedulDate int64, schedulType int64, partitionType int64, page int64, limit int64, start int64, end int64) (schedule []*models.DialysisScheduleFlow, err error, total int64) {
 	db := readDb.Model(&models.DialysisScheduleFlow{})
-	if start > 0 && end > 0 {
-		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
-			Preload("TreatmentMode", "status = 1").
-			Preload("DialysisFinish", "status = 1 AND user_org_id = ? and record_date>=? and record_date<=?", orgID, start, end).
-			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
-		db = db.Where("xt_schedule.status = 1")
-	}
+
+	fmt.Println("schedule_date--------------------", schedulDate)
 	if schedulDate > 0 {
 		db = db.Preload("DeviceNumber", "org_id = ?", orgID).
 			Preload("TreatmentMode", "status = 1").
-			Preload("DialysisFinish", "status = 1 AND user_org_id = ? and record_date>=? and record_date<=?", orgID, schedulDate, schedulDate).
+			Preload("DialysisFinish", "status = 1 AND user_org_id = ? and record_date =?", orgID, schedulDate).
 			Preload("MonitorPatients", "status = 1 AND user_org_id = ?", orgID)
 		db = db.Where("xt_schedule.status = 1")
 		db = db.Where("schedule_date = ?", schedulDate)
@@ -2239,3 +2235,10 @@ func GetDialysisWatchFlow(orgID int64, schedulDate int64, schedulType int64, par
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("bed_id desc").Find(&schedule).Error
 	return schedule, err, total
 }
+
+func GetPrescriptionInfo(user_org_id int64, patient_id int64, record_date int64) (models.HisPrescriptionInfo, error) {
+
+	info := models.HisPrescriptionInfo{}
+	err := XTReadDB().Where("user_org_id = ? and patient_id =? and record_date = ? and status=1", user_org_id, patient_id, record_date).Find(&info).Error
+	return info, err
+}

service/his_hospital_service.go

@@ -580,3 +580,28 @@ func GetUnChargeHisHospitalPrescription(org_id int64, start_time int64, end_time
 		Find(&prescription).Error
 	return
 }
+
+func GetLastInHospitalRecord(patient_id int64, user_org_id int64) (record models.HisHospitalCheckRecord, err error) {
+	err = readDb.Model(&models.HisHospitalCheckRecord{}).Where("patient_id = ? AND status = 1 AND user_org_id = ? AND in_hospital_status = 1 AND out_hospital_status = 0", patient_id, user_org_id).Last(&record).Error
+	return
+}
+
+func GetHisInHospitalHistory(keyword string, startime int64, endtime int64, limit int64, page int64, orgid int64) (hisPatient []*models.HisHospitalCheckRecord, total int64, err error) {
+	offset := (page - 1) * limit
+	likeKey := "%" + keyword + "%"
+	db := XTReadDB().Model(&models.HisHospitalCheckRecord{})
+	if len(keyword) > 0 {
+		db = db.Where("name like ?", likeKey)
+	}
+	if startime > 0 {
+		db = db.Where("record_date >= ?", startime)
+	}
+	if endtime > 0 {
+		db = db.Where("record_date<=?", endtime)
+	}
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	err = db.Offset(offset).Limit(limit).Order("id desc").Find(&hisPatient).Error
+	return hisPatient, total, err
+}

service/his_service.go

@@ -1350,6 +1350,13 @@ func FindAllDiagnose(orgId int64) (list []*models.HisXtDiagnoseConfig, err error
 	return
 }
 
+func FindPatientDianose(orgId int64) (list []*models.XtPatientDiagnose, err error) {
+
+	err = readDb.Where("user_org_id =?", orgId).Find(&list).Error
+
+	return list, err
+}
+
 func FindAllAddition(orgId int64) (list []*models.XtHisAddtionConfig, err error) {
 	db := readDb.Model(&models.XtHisAddtionConfig{})
 	db = db.Where("user_org_id = ? AND status = 1", orgId)

service/manage_center_service.go

@@ -1035,3 +1035,47 @@ func GoodAutoAddCancelInfo(good *models.NewDialysisBeforePrepareGoods, creater i
 	}
 	return err
 }
+
+func CreatePatientDiagnose(diagnose models.XtPatientDiagnose) error {
+
+	err := XTWriteDB().Create(&diagnose).Error
+
+	return err
+}
+
+func GetPatientDiagnose(limit int64, page int64, orgid int64) (list []*models.XtPatientDiagnose, total int64, err error) {
+
+	db := XTReadDB().Model(&list).Where("status =1")
+
+	if orgid > 0 {
+		db = db.Where("user_org_id = ?", orgid)
+	}
+	offset := (page - 1) * limit
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("sort asc").Find(&list).Error
+	return
+}
+
+func GetPatientDiagnoseDetail(id int64) (models.XtPatientDiagnose, error) {
+
+	diagnose := models.XtPatientDiagnose{}
+
+	err := XTReadDB().Where("id = ? and status =1", id).Find(&diagnose).Error
+
+	return diagnose, err
+}
+
+func UpdatePatientCase(class_name string, sort int64, id int64) error {
+
+	diagnose := models.XtPatientDiagnose{}
+
+	err := XTReadDB().Model(&diagnose).Where("id = ? and status=1", id).Updates(map[string]interface{}{"class_name": class_name, "sort": sort}).Error
+
+	return err
+}
+
+func DeletePatientDiagnose(id int64) error {
+
+	err := XTWriteDB().Model(&models.XtPatientDiagnose{}).Where("id=? and status= 1", id).Updates(map[string]interface{}{"status": 0}).Error
+	return err
+}

service/manage_service.go

@@ -374,7 +374,7 @@ func GetDialysisTime(time int64, patientid int64, orgid int64) (models.Assessmen
 }
 
 func GetAllOrganization(orgid int64, appid int64) (approle []*models.App_Role, err error) {
-	err = UserReadDB().Where("org_id = ? AND app_id = ? AND status = 1", orgid, appid).Find(&approle).Error
+	err = UserReadDB().Where("org_id = ? AND app_id = ?", orgid, appid).Find(&approle).Error
 	return approle, err
 }
 
@@ -824,7 +824,7 @@ func GetUserForm(id int64, orgId int64, limit int64, page int64) (infor []*model
 		if orgId > 0 {
 			db = db.Where("x.user_org_id = ?", orgId)
 		}
-		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date asc").Scan(&infor).Error
+		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.admin_user_id,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date asc").Scan(&infor).Error
 		if err != nil {
 			return
 		}
@@ -844,7 +844,7 @@ func GetUserForm(id int64, orgId int64, limit int64, page int64) (infor []*model
 		if orgId > 0 {
 			db = db.Where("x.user_org_id = ?", orgId)
 		}
-		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date desc").Scan(&infor).Error
+		err = db.Group("x.id").Select("x.id,x.date,x.class,x.zone,x.bed_number,x.patient_id,x.contagion,x.dialysis_mode,x.start_time,x.end_time,x.dialysis_hour,x.hyperfiltratio,x.weight_loss,x.warning_value,x.user_total,x.move,x.failure_stage,x.fault_description,x.code_information,x.disinfect_type,x.disinfectant_type,x.disinfection,x.machine_run,x.fluid_path,x.disinfectant,x.disinfection_status,x.disinfection_residue,x.long_time,x.disinfec_startime,x.disinfec_endtime,x.dialysis_checked,x.dialysis_name,x.norms,x.dialysis_concentration,x.germ_checked,x.germ_name,x.germ_number,x.clean,x.sign_name,x.equiment_id,x.bed,p.name,r.admin_user_id,r.user_name").Count(&total).Joins("Left Join sgj_xt.xt_patients as p on p.id = x.patient_id").Joins("Left Join sgj_user_admin_role as r on r.admin_user_id = x.sign_name").Offset(offset).Limit(limit).Order("x.date desc").Scan(&infor).Error
 		if err != nil {
 			return
 		}

service/mobile_dialysis_service.go

@@ -4482,13 +4482,14 @@ func GetFistMonitor(orgid int64, patient_id int64, dialysis_date int64) (models.
 	return record, err
 }
 
+func GetFistMonitorSix(orgid int64, patient_id int64, dialysis_date int64) (record []*models.MonitoringRecord, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and patient_id = ? and monitoring_date = ? and status = 1", orgid, patient_id, dialysis_date).Find(&record).Error
+	return record, err
+}
+
 func MobileGetScheduleDoctorAdvicesOne(orgID int64, scheduleDate int64, adviceType int, patientType int, adminUserId int64, deliverWay string, scheduleType int64, partitonType int64, patient_id int64, execution_state int64, cost_type int64, execution_frequency string) ([]*MScheduleDoctorAdviceVM, error) {
 
-	fmt.Println("execution_frequency---------------------------", execution_frequency)
-	fmt.Println("cost_type-----------", cost_type)
-	fmt.Println("adviceType-----------", adviceType)
-	fmt.Println("patientType---------", patientType)
-	fmt.Println("len(deliverWay)--------", len(deliverWay))
 	var vms []*MScheduleDoctorAdviceVM
 	adviceWhere := ""
 	adviceCondition := []interface{}{}

service/new_warehouse_service.go

@@ -1308,15 +1308,25 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 	// 如果没有对应的库存，则报错
 	storeConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
-	if lastWarehouse.StockMinNumber >= drup.MinNumber {
-		var stockMax int64
-		var stockMin int64
-		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
-		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			var stockMax int64
+			var stockMin int64
+			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+
+			ChangeMaxNumber(lastWarehouse.ID, stockMax)
+			UpdateMinNumber(lastWarehouse.ID, stockMin)
+		}
+	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber)
 
-		ChangeMaxNumber(lastWarehouse.ID, stockMax)
-		UpdateMinNumber(lastWarehouse.ID, stockMin)
 	}
+
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
@@ -1374,12 +1384,16 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 
 		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金1")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
 		}
+
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
+			//fmt.Println("金2")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
+			//fmt.Println("金3")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 
@@ -1392,13 +1406,16 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		warehouse.Mtime = time.Now().Unix()
 
+		//fmt.Println("stockmin", warehouse.StockMinNumber)
+		//fmt.Println("minnubmerr", minNumber)
 		if warehouse.StockMinNumber < minNumber {
-
+			//fmt.Println("金4")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			if warehouse.MaxUnit != warehouse.MinUnit {
 				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 			}
 		} else {
+			//fmt.Println("金5")
 			if minNumber > 0 {
 				if (warehouse.StockMinNumber - minNumber) >= 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
@@ -1407,6 +1424,7 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 			}
 
 			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
+				//fmt.Println("6")
 				if warehouse.StockMinNumber > 0 {
 					if warehouse.StockMinNumber-deliver_number >= 0 {
 						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
@@ -1418,8 +1436,9 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 
 		}
 
-		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit {
+		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) >= 0 {
+				//fmt.Println("金7")
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			}
 
@@ -1561,74 +1580,80 @@ func BloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseou
 		}
 
 		//如果本次出库数据大于历史出库数据 新增1条流水
+		//fmt.Println("deliver_number233233223232wi", deliver_number)
+		//fmt.Println("out_coutn23333333333333333", out_count)
+		//fmt.Println("cancel_coutn099992ow", cancel_count)
 		if deliver_number >= (out_count - cancel_count) {
-			drugflow := models.DrugFlow{
-				WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
-				WarehouseOutId:          warehouseout.ID,
-				DrugId:                  advice.DrugId,
-				Number:                  warehouse.Number,
-				ProductDate:             warehouse.ProductDate,
-				ExpireDate:              warehouse.ExpiryDate,
-				Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
-				Price:                   warehouse.RetailPrice,
-				Status:                  1,
-				Ctime:                   time.Now().Unix(),
-				UserOrgId:               orgID,
-				Manufacturer:            warehouse.Manufacturer,
-				Dealer:                  warehouse.Dealer,
-				BatchNumber:             warehouse.BatchNumber,
-				MaxUnit:                 drup.MinUnit,
-				ConsumableType:          3,
-				IsEdit:                  1,
-				Creator:                 advice.ExecutionStaff,
-				IsSys:                   1,
-				PatientId:               advice.PatientId,
-				SystemTime:              advice.AdviceDate,
-				WarehousingDetailId:     warehouse.ID,
-				SupplyWarehouseId:       warehouse.SupplyWarehouseId,
-				StorehouseId:            storeConfig.DrugStorehouseOut,
-				WarehouseOutDetailId:    lastDrugOutInfo.ID,
-				OverCount:               sum_count,
-				AdviceId:                advice.ID,
-				LastPrice:               warehouse.Price,
-			}
+			if (deliver_number - out_count - cancel_count) != 0 {
+				drugflow := models.DrugFlow{
+					WarehouseOutOrderNumber: warehouseout.WarehouseOutOrderNumber,
+					WarehouseOutId:          warehouseout.ID,
+					DrugId:                  advice.DrugId,
+					Number:                  warehouse.Number,
+					ProductDate:             warehouse.ProductDate,
+					ExpireDate:              warehouse.ExpiryDate,
+					Count:                   deliver_number - (out_count - cancel_count), //按最小单位计算,
+					Price:                   warehouse.RetailPrice,
+					Status:                  1,
+					Ctime:                   time.Now().Unix(),
+					UserOrgId:               orgID,
+					Manufacturer:            warehouse.Manufacturer,
+					Dealer:                  warehouse.Dealer,
+					BatchNumber:             warehouse.BatchNumber,
+					MaxUnit:                 drup.MinUnit,
+					ConsumableType:          3,
+					IsEdit:                  1,
+					Creator:                 advice.ExecutionStaff,
+					IsSys:                   1,
+					PatientId:               advice.PatientId,
+					SystemTime:              advice.AdviceDate,
+					WarehousingDetailId:     warehouse.ID,
+					SupplyWarehouseId:       warehouse.SupplyWarehouseId,
+					StorehouseId:            storeConfig.DrugStorehouseOut,
+					WarehouseOutDetailId:    lastDrugOutInfo.ID,
+					OverCount:               sum_count,
+					AdviceId:                advice.ID,
+					LastPrice:               warehouse.Price,
+				}
 
-			errThreeTy := CreateDrugFlowOne(drugflow)
+				errThreeTy := CreateDrugFlowOne(drugflow)
 
-			if errThreeTy != nil {
-				drugError := models.XtDrugError{
-					UserOrgId:             orgID,
-					DrugId:                advice.DrugId,
-					RecordDate:            advice.AdviceDate,
-					PatientId:             advice.PatientId,
-					Remark:                "创建流水失败",
-					Status:                1,
-					Ctime:                 time.Now().Unix(),
-					Mtime:                 0,
-					SumCount:              0,
-					Prescribingnumber:     advice.PrescribingNumber,
-					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				if errThreeTy != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "创建流水失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
 				}
-				CreateDrugError(drugError)
-			}
-			//出库数量相加
-			errThreeTys := AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
+				//出库数量相加
+				errThreeTys := AddDrugCount(advice.DrugId, orgID, storeConfig.DrugStorehouseOut, drugflow.Count)
 
-			if errThreeTys != nil {
-				drugError := models.XtDrugError{
-					UserOrgId:             orgID,
-					DrugId:                advice.DrugId,
-					RecordDate:            advice.AdviceDate,
-					PatientId:             advice.PatientId,
-					Remark:                "出库数量相加失败",
-					Status:                1,
-					Ctime:                 time.Now().Unix(),
-					Mtime:                 0,
-					SumCount:              0,
-					Prescribingnumber:     advice.PrescribingNumber,
-					PrescribingNumberUnit: advice.PrescribingNumberUnit,
+				if errThreeTys != nil {
+					drugError := models.XtDrugError{
+						UserOrgId:             orgID,
+						DrugId:                advice.DrugId,
+						RecordDate:            advice.AdviceDate,
+						PatientId:             advice.PatientId,
+						Remark:                "出库数量相加失败",
+						Status:                1,
+						Ctime:                 time.Now().Unix(),
+						Mtime:                 0,
+						SumCount:              0,
+						Prescribingnumber:     advice.PrescribingNumber,
+						PrescribingNumberUnit: advice.PrescribingNumberUnit,
+					}
+					CreateDrugError(drugError)
 				}
-				CreateDrugError(drugError)
+
 			}
 
 		}

service/patient_service.go

@@ -871,7 +871,7 @@ func UpdatePatientLapseto(patientid int64, lapseto models.PatientLapseto) error
 func UpdatepatientTwo(patientsNew *models.XtPatientsNew, id int64) error {
 
 	err := XTWriteDB().Model(&patientsNew).Where("blood_id = ?", id).Update(map[string]interface{}{"user_org_id": patientsNew.UserOrgId, "user_id": patientsNew.UserId, "avatar": patientsNew.Avatar, "patient_type": patientsNew.Avatar, "dialysis_no": patientsNew.DialysisNo, "admission_number": patientsNew.AdmissionNumber, "source": patientsNew.Source, "lapseto": patientsNew.Lapseto, "partition_id": patientsNew.PartitionId, "bed_id": patientsNew.BedId, "name": patientsNew.Name, "alias": patientsNew.Alias, "gender": patientsNew.Gender, "marital_status": patientsNew.MaritalStatus, "id_card_no": patientsNew.IdCardNo, "birthday": patientsNew.Birthday, "reimbursement_way_id": patientsNew.ReimbursementWayId, "health_care_type": patientsNew.HealthCareType, "health_care_no": patientsNew.HealthCareType, "health_care_due_date": patientsNew.HealthCareType, "height": patientsNew.Height, "blood_type": patientsNew.BloodType, "rh": patientsNew.Rh, "health_care_due_alert_date": patientsNew.HealthCareDueAlertDate, "education_level": patientsNew.EducationLevel, "profession": patientsNew.Profession, "phone": patientsNew.Phone, "home_telephone": patientsNew.HomeTelephone, "relative_phone": patientsNew.RelativePhone, "relative_relations": patientsNew.RelativeRelations, "home_address": patientsNew.HomeAddress, "work_unit": patientsNew.WorkUnit, "unit_address": patientsNew.UnitAddress, "children": patientsNew.Children, "receiving_date": patientsNew.ReceivingDate, "is_hospital_first_dialysis": patientsNew.IsHospitalFirstDialysis, "first_dialysis_date": patientsNew.FirstDialysisDate, "first_dialysis_hospital": patientsNew.FirstDialysisHospital, "predialysis_condition": patientsNew.PredialysisCondition, "pre_hospital_dialysis_frequency": patientsNew.PreHospitalDialysisFrequency, "pre_hospital_dialysis_times": patientsNew.PreHospitalDialysisFrequency, "hospital_first_dialysis_date": patientsNew.HospitalFirstDialysisDate, "induction_period": patientsNew.InductionPeriod, "initial_dialysis": patientsNew.InitialDialysis, "total_dialysis": patientsNew.TotalDialysis, "attending_doctor_id": patientsNew.AttendingDoctorId, "head_nurse_id": patientsNew.HeadNurseId, "evaluate": patientsNew.Evaluate, "diagnose": patientsNew.Diagnose, "remark": patientsNew.Remark, "registrars_id": patientsNew.RegistrarsId, "registrars": patientsNew.Registrars, "qr_code": patientsNew.QrCode, "binding_state": patientsNew.BindingState, "patient_complains": patientsNew.PatientComplains, "present_history": patientsNew.PresentHistory, "past_history": patientsNew.PastHistory, "temperature": patientsNew.Temperature,
-		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan}).Error
+		"pulse": patientsNew.Pulse, "respiratory": patientsNew.Respiratory, "sbp": patientsNew.Sbp, "dbp": patientsNew.Dbp, "nation": patientsNew.Nation, "native_place": patientsNew.NativePlace, "age": patientsNew.Age, "infectious_next_record_time": patientsNew.InfectiousNextRecordTime, "is_infectious": patientsNew.IsInfectious, "remind_cycle": patientsNew.RemindCycle, "response_result": patientsNew.ResponseResult, "is_open_remind": patientsNew.IsOpenRemind, "first_treatment_date": patientsNew.FirstTreatmentDate, "dialysis_age": patientsNew.DialysisAge, "expense_kind": patientsNew.ExpenseKind, "tell_phone": patientsNew.ExpenseKind, "contact_name": patientsNew.ContactName, "blood_patients": patientsNew.BloodPatients, "slow_patients": patientsNew.SlowPatients, "member_patients": patientsNew.MemberPatients, "ecommer_patients": patientsNew.EcommerPatients, "troble_shoot": patientsNew.TrobleShoot, "sch_remark": patientsNew.SchRemark, "treatment_plan": patientsNew.TreatmentPlan, "record_number": patientsNew.RecordNumber}).Error
 	return err
 }
 
@@ -1240,6 +1240,48 @@ func GetDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64,
 	return
 }
 
+func GetLongDoctorAdviceList(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64) (advices []*models.DoctorAdvices, total int64, err error) {
+
+	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
+	table := UserReadDB().Table("sgj_user_admin_role as r")
+	fmt.Print("table", table)
+	if orgID > 0 {
+		db = db.Where("x.user_org_id=?", orgID)
+	}
+	if patientID > 0 {
+		db = db.Where("x.patient_id = ?", patientID)
+	}
+	if advice_type == 1 && advice_type > 0 {
+		db = db.Where("x.advice_type = ?", advice_type)
+	}
+	if advice_type == 3 && advice_type > 0 {
+		db = db.Where("x.advice_type = 2 or x.advice_type = 3")
+	}
+	if advice_type == 4 && advice_type > 0 {
+		db = db.Where("x.advice_type = 4")
+	}
+	if stop == 1 {
+		db = db.Where("(x.stop_state=? or x.execution_state=?)", stop, stop)
+	} else if stop == 2 {
+		db = db.Where("x.stop_state=? and x.execution_state=?", stop, stop)
+	}
+
+	if start != 0 {
+		db = db.Where("x.start_time>=?", start)
+	}
+	if end != 0 {
+		db = db.Where("x.start_time<=?", end)
+	}
+	if len(keywords) > 0 {
+		likeKey := "%" + keywords + "%"
+		db = db.Where("x.advice_name LIKE ?", likeKey)
+	}
+	offset := (page - 1) * limit
+	err = db.Group("x.id").Count(&total).Offset(offset).Limit(limit).Select("x.id, x.user_org_id, x.patient_id, x.advice_type, x.advice_date, x.record_date, x.start_time, x.advice_name,x.advice_desc, x.reminder_date, x.drug_spec, x.drug_spec_unit, x.single_dose, x.single_dose_unit, x.prescribing_number, x.prescribing_number_unit, x.delivery_way, x.execution_frequency, x.advice_doctor, x.status, x.created_time,x.updated_time, x.advice_affirm, x.remark, x.stop_time, x.stop_reason, x.stop_doctor, x.stop_state, x.parent_id, x.execution_time, x.execution_staff, x.execution_state, x.checker, x.check_state, x.check_time, x.groupno,x.remind_type,x.frequency_type,x.day_count,x.week_day,x.parent_id,x.push_start_time,r.user_name, IF(x.parent_id > 0, x.parent_id, x.id) as advice_order").Joins("Left join sgj_users.sgj_user_admin_role as r on r.admin_user_id = x.advice_doctor").Order("start_time desc, groupno desc, advice_order desc, id asc").Scan(&advices).Error
+	fmt.Print("err", err)
+	return
+}
+
 func GetDoctorAdviceListOne(orgID, patientID, advice_type, stop, start, end int64, keywords string, page int64, limit int64) (advices []*models.DoctorAdvices, total int64, err error) {
 
 	db := readDb.Table("xt_doctor_advice as x").Where("x.status = 1")
@@ -1949,7 +1991,7 @@ func GetDialysisCount(orgid int64, partitionid int64) (order []*models.BloodDial
 
 func UpdatePatientDialysisSolutionOne(patientid int64, orgid int64, prescription *models.DialysisPrescription, timenow int64) error {
 
-	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime, "dialysis_strainer": prescription.DialysisStrainer}).Error
+	err = XTWriteDB().Model(&prescription).Where("patient_id = ? and user_org_id = ? and record_date = ? ", patientid, orgid, timenow).Updates(map[string]interface{}{"dialyzer": prescription.Dialyzer, "anticoagulant": prescription.Anticoagulant, "mode_id": prescription.ModeId, "dialysis_duration_hour": prescription.DialysisDurationHour, "anticoagulant_shouji": prescription.AnticoagulantShouji, "anticoagulant_weichi": prescription.AnticoagulantWeichi, "anticoagulant_zongliang": prescription.AnticoagulantZongliang, "kalium": prescription.Kalium, "sodium": prescription.Sodium, "calcium": prescription.Calcium, "dialyzer_perfusion_apparatus": prescription.DialyzerPerfusionApparatus, "blood_access": prescription.BloodAccess, "dialysate_flow": prescription.DialysateFlow, "dialysate_temperature": prescription.DialysateTemperature, "dialysis_dialyszers": prescription.DialysisDialyszers, "dialysis_irrigation": prescription.DialysisIrrigation, "plasma_separator": prescription.PlasmaSeparator, "bilirubin_adsorption_column": prescription.BilirubinAdsorptionColumn, "oxygen_uptake": prescription.OxygenUptake, "oxygen_flow": prescription.OxygenFlow, "oxygen_time": prescription.OxygenTime, "dialysis_strainer": prescription.DialysisStrainer, "chaptalization": prescription.Chaptalization}).Error
 	return err
 }
 

service/patientmanage_service.go

@@ -912,7 +912,7 @@ func GetDialysisrecord(patientID int64, start int64, end int64, limit int64, pag
 
 func GetAllDoctorTwo(orgid int64, appid int64) (appRole []*models.SgjUserAdminRole, err error) {
 
-	err = UserReadDB().Where("org_id = ? and app_id = ? and status = ? ", orgid, appid, 1).Find(&appRole).Error
+	err = UserReadDB().Where("org_id = ? and app_id = ?", orgid, appid).Find(&appRole).Error
 	return appRole, err
 }
 

service/pharmacy_service.go

@@ -1226,8 +1226,7 @@ func FenDrugInventory(item *models.HisDoctorAdviceInfo, orgid int64) bool {
 		total = list.Count*medical.MinNumber + list.StockMinNumber
 		prescribing_number_total = count
 	}
-	fmt.Println("prescribing_number_total-----", prescribing_number_total)
-	fmt.Println("total-------------", total)
+
 	if prescribing_number_total <= total {
 		//可以扣减
 		return true

service/print_data_service/schedule_dialysis/print_schedule_dialysis_models.go

@@ -303,6 +303,11 @@ type AssessmentBeforeDislysisVM struct {
 	Period                         int64   `gorm:"column:period" json:"period" form:"period"`
 	EstimatedFoodIntake            string  `gorm:"column:estimated_food_intake" json:"estimated_food_intake" form:"estimated_food_intake"`
 	UserOrgId                      int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	CatheterEvaluationProgram      string  `gorm:"column:catheter_evaluation_program" json:"catheter_evaluation_program" form:"catheter_evaluation_program"`
+	SkinSiteCatheterization        string  `gorm:"column:skin_site_catheterization" json:"skin_site_catheterization" form:"skin_site_catheterization"`
+	WhetherUnobstructed            int64   `gorm:"column:whether_unobstructed" json:"whether_unobstructed" form:"whether_unobstructed"`
+	LienNecessary                  int64   `gorm:"column:lien_necessary" json:"lien_necessary" form:"lien_necessary"`
+	PathwayFormationTime           int64   `gorm:"column:pathway_formation_time" json:"pathway_formation_time" form:"pathway_formation_time"`
 }
 
 func (AssessmentBeforeDislysisVM) TableName() string {
@@ -567,6 +572,8 @@ type MonitoringRecordVM struct {
 	BloodPressureMonitoringSite int64   `gorm:"column:blood_pressure_monitoring_site" json:"blood_pressure_monitoring_site" form:"blood_pressure_monitoring_site"`
 	UserOrgId                   int64   `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
 	FilterPressure              string  `gorm:"column:filter_pressure" json:"filter_pressure" form:"filter_pressure"`
+	Dicarbonate                 float64 `gorm:"column:dicarbonate" json:"dicarbonate" form:"dicarbonate"`
+	ReplacementSpeed            float64 `gorm:"column:replacement_speed" json:"replacement_speed" form:"replacement_speed"`
 }
 
 func (MonitoringRecordVM) TableName() string {

service/schedule_service.go

@@ -1671,3 +1671,20 @@ func CreateScheduleTwo(m *models.Schedule) error {
 	utx.Commit()
 	return err
 }
+
+func GetLongSolutionByModeId(patient_id int64, mode_id int64, user_org_id int64) (models.DialysisSolution, error) {
+
+	solution := models.DialysisSolution{}
+
+	err := XTReadDB().Where("patient_id = ? and mode_id = ? and user_org_id = ? and status= 1 and solution_status =1", patient_id, mode_id, user_org_id).Find(&solution).Error
+	return solution, err
+}
+
+func UpdateScheduleByDialysis(patient_id int64, mode_id int64, schedule_date int64, user_org_id int64, dialyzer_perfusion_apparatus string, schedule_type int64) error {
+
+	schedule := models.XtSchedule{}
+
+	err := XTWriteDB().Model(&schedule).Where("patient_id = ? and mode_id = ? and schedule_date = ? and user_org_id = ? and schedule_type = ?", patient_id, mode_id, schedule_date, user_org_id, schedule_type).Updates(map[string]interface{}{"dialysis_machine_name": dialyzer_perfusion_apparatus}).Error
+
+	return err
+}

service/stock_service.go

@@ -982,6 +982,7 @@ type VMDrugWarehouse struct {
 	StorehouseId      int64                `gorm:"column:storehouse_id" json:"storehouse_id" form:"storehouse_id"`
 	IsSys             int64                `gorm:"column:is_sys" json:"is_sys" form:"is_sys"`
 	IsCheck           int64                `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	Checker           int64                `gorm:"column:checker" json:"checker" form:"checker"`
 }
 
 func (VMDrugWarehouse) TableName() string {
@@ -6299,7 +6300,7 @@ func UpdateWarehouseInfoByGoodId(info models.WarehousingInfo, id int64) error {
 
 func UpdateWarehouseInfoByGoodIdOne(info *models.WarehousingInfo, id int64) error {
 
-	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber}).Error
+	err := XTWriteDB().Model(&info).Where("id =? and status = 1", id).Updates(map[string]interface{}{"warehousing_count": info.WarehousingCount, "stock_count": info.StockCount, "price": info.Price, "number": info.Number, "product_date": info.ProductDate, "expiry_date": info.ExpiryDate, "license_number": info.LicenseNumber, "manufacturer": info.Manufacturer, "dealer": info.Dealer, "remark": info.Remark, "packing_price": info.PackingPrice, "storehouse_id": info.StorehouseId, "register_number": info.RegisterNumber, "good_id": info.GoodId}).Error
 	return err
 }
 
@@ -7366,10 +7367,10 @@ func UpdateWarehouseDetail(info *models.WarehousingInfo, id int64) error {
 	return err
 }
 
-func UpdateCheckWarehouseInfo(id int64) error {
+func UpdateCheckWarehouseInfo(id int64, checker int64) error {
 
 	tx := XTWriteDB().Begin()
-	err := tx.Model(&models.Warehousing{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"is_check": 1}).Error
+	err := tx.Model(&models.Warehousing{}).Where("id =? and status = 1", id).Update(map[string]interface{}{"is_check": 1, "checker": checker}).Error
 	if err != nil {
 		tx.Rollback()
 		return err
@@ -7506,9 +7507,9 @@ func UpdateWarehouseing(info *models.DrugWarehouseInfo) error {
 	return err
 }
 
-func CheckWarehousingInfo(id int64, orgid int64) error {
+func CheckWarehousingInfo(id int64, orgid int64, checker int64) error {
 	tx := XTWriteDB().Begin()
-	err := tx.Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"is_check": 1}).Error
+	err := tx.Model(&models.DrugWarehouse{}).Where("id = ? and org_id = ? and status = 1", id, orgid).Update(map[string]interface{}{"is_check": 1, "checker": checker}).Error
 	if err != nil {
 		tx.Rollback()
 		return err

service/warhouse_service.go

@@ -131,15 +131,25 @@ func DrugDeliverInfo(orgID int64, prescribingNumber float64, warehouseout *model
 	// 如果没有对应的库存，则报错
 	storeConfig, _ := GetAllStoreHouseConfig(advice.UserOrgId)
 	lastWarehouse, _ := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
-	if lastWarehouse.StockMinNumber >= drup.MinNumber {
-		var stockMax int64
-		var stockMin int64
-		stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
-		stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+		if lastWarehouse.StockMinNumber >= drup.MinNumber {
+			var stockMax int64
+			var stockMin int64
+			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
+			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
+
+			ChangeMaxNumber(lastWarehouse.ID, stockMax)
+			UpdateMinNumber(lastWarehouse.ID, stockMin)
+		}
+	}
+
+	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
+
+		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+		ChangeMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber)
 
-		ChangeMaxNumber(lastWarehouse.ID, stockMax)
-		UpdateMinNumber(lastWarehouse.ID, stockMin)
 	}
+
 	warehouse, err := FindLastDrugWarehousingInfoByID(advice.DrugId, storeConfig.DrugStorehouseOut)
 
 	if err != nil {
@@ -554,7 +564,6 @@ func HisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoctorAdvice
 		drup, _ := FindBaseDrugLibRecord(orgID, advice.DrugId)
 		if drup.ID > 0 {
 			prescribingNumber := advice.PrescribingNumber
-			//HisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
 
 			BloodHisDrugDeliverInfo(orgID, prescribingNumber, &out, &drup, advice)
 
@@ -5988,6 +5997,12 @@ func ChangeMaxNumber(id int64, count int64) error {
 	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).UpdateColumn("stock_max_number", gorm.Expr("stock_max_number + ?", count)).Error
 	return err
 
+}
+func ChangeMaxNumberOne(id int64, count int64) error {
+
+	err = XTWriteDB().Model(&models.DrugWarehouseInfo{}).Where("id = ? and status = 1 and is_check = 1", id).Updates(map[string]interface{}{"stock_max_number": count, "stock_min_number": 0}).Error
+	return err
+
 }
 
 func UpdateMinNumber(id int64, count int64) error {