hahah

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 = 10744 //机构id
+		subscibe.OrgId = 10721 //机构id
 		subscibe.PeriodStart = 1547447814
 		subscibe.PeriodEnd = 1550039814
 		subscibe.State = 1
@@ -93,8 +93,8 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10744 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 18470 //4
+		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 18723 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -329,7 +329,7 @@ func (this *BaseServeAPIController) Prepare() {
 		userAdmin.ModifyTime = 1530786071
 		var subscibe models.ServeSubscibe
 		subscibe.ID = 11
-		subscibe.OrgId = 10744 //机构id小英9675或4
+		subscibe.OrgId = 10721 //机构id小英9675或4
 		subscibe.PeriodStart = 1538035409
 		subscibe.PeriodEnd = 1569571409
 		subscibe.State = 1
@@ -339,8 +339,8 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
-		adminUserInfo.CurrentOrgId = 10744 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 18470 //4
+		adminUserInfo.CurrentOrgId = 10721 //机构id小英9675或4
+		adminUserInfo.CurrentAppId = 18723 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/common_api_controller.go

@@ -1,15 +1,16 @@
 package controllers
 
 import (
+	"encoding/json"
+	"fmt"
+	"strconv"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/utils"
-	"encoding/json"
-	"fmt"
 	"github.com/jinzhu/gorm"
-	"strconv"
-	"time"
 )
 
 type CommonApiController struct {
@@ -583,11 +584,10 @@ func (this *CommonApiController) GetTotalLapseCount() {
 func (this *CommonApiController) GetTotalSexCount() {
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
-	fmt.Println("orgid", orgid)
-	startime, _ := this.GetInt64("startime")
-	fmt.Println("开始时间", startime)
-	endtime, _ := this.GetInt64("endtime")
-	fmt.Println("结束时间", endtime)
+	//startime, _ := this.GetInt64("startime")
+	//
+	//endtime, _ := this.GetInt64("endtime")
+
 	lapsetotype, _ := this.GetInt64("lapsetotype")
 	sourcetype, _ := this.GetInt64("sourcetype")
 	total := service.GetPatientTotalCount(orgid, lapsetotype, sourcetype)
@@ -642,11 +642,6 @@ func (this *CommonApiController) GetTotalInfectiouscount() {
 func (this *CommonApiController) GetTotalAgeCount() {
 	adminUser := this.GetAdminUserInfo()
 	orgid := adminUser.CurrentOrgId
-	fmt.Println("orgid", orgid)
-	startime, _ := this.GetInt64("startime")
-	fmt.Println("开始时间", startime)
-	endtime, _ := this.GetInt64("endtime")
-	fmt.Println("结束时间", endtime)
 	lapsetotype, _ := this.GetInt64("lapsetotype")
 	sourcetype, _ := this.GetInt64("sourcetype")
 	//统计透析总人数
@@ -1451,6 +1446,7 @@ func (this *CommonApiController) GetPatientscontrol() {
 	limit, _ := this.GetInt64("limit")
 
 	patients, total, err := service.GetPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix, page, limit)
+
 	control, err := service.GetLastPatientsControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)
 
 	infectiousControl, err := service.GetInfectiousControl(orgid, lapstor, startimeStrUnix, endtimeStrsUnix)

controllers/dialysis_api_controller.go

@@ -2879,13 +2879,13 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 			service.CreateDialysisFinish(finish)
 		}
 
-		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 {
+		if adminUserInfo.CurrentOrgId == 9671 || adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10469 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10579 || adminUserInfo.CurrentOrgId == 10580 || adminUserInfo.CurrentOrgId == 10585 || adminUserInfo.CurrentOrgId == 10344 || adminUserInfo.CurrentOrgId == 10622 || adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10164 || adminUserInfo.CurrentOrgId == 10727 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10480 || adminUserInfo.CurrentOrgId == 10293 || adminUserInfo.CurrentOrgId == 9478 {
 			var dewater_amount float64
 			dewater_amount = 0
 			if dry_weight > 0 {
 				dewater_amount = weight_before - dry_weight - additional_weight
 
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 && adminUserInfo.CurrentOrgId != 10723 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10579 && adminUserInfo.CurrentOrgId != 10580 && adminUserInfo.CurrentOrgId != 10585 && adminUserInfo.CurrentOrgId != 10344 && adminUserInfo.CurrentOrgId != 10622 && adminUserInfo.CurrentOrgId != 10702 && adminUserInfo.CurrentOrgId != 10635 && adminUserInfo.CurrentOrgId != 10723 && adminUserInfo.CurrentOrgId != 10480 && adminUserInfo.CurrentOrgId != 10293 && adminUserInfo.CurrentOrgId != 9478 {
 					dewater_amount = dewater_amount * 1000
 				}
 
@@ -3248,8 +3248,8 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		dewater_amount = 0
 		if evaluation.DryWeight > 0 {
 			dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10757 {
-				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10751 {
+			if templateInfo.TemplateId == 17 || templateInfo.TemplateId == 22 || templateInfo.TemplateId == 21 || templateInfo.TemplateId == 34 || adminUserInfo.CurrentOrgId == 10551 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10757 || adminUserInfo.CurrentOrgId == 9478 {
+				if adminUserInfo.CurrentOrgId != 10551 && adminUserInfo.CurrentOrgId != 10751 && adminUserInfo.CurrentOrgId != 9478 {
 					dewater_amount = dewater_amount * 1000
 				}
 
@@ -3526,7 +3526,7 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 		}
 
 		//针对孝昌康桥超滤率计算问题
-		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10697 {
+		if adminUserInfo.CurrentOrgId == 10702 || adminUserInfo.CurrentOrgId == 10635 || adminUserInfo.CurrentOrgId == 10723 || adminUserInfo.CurrentOrgId == 10721 || adminUserInfo.CurrentOrgId == 10726 || adminUserInfo.CurrentOrgId == 10742 || adminUserInfo.CurrentOrgId == 10751 || adminUserInfo.CurrentOrgId == 10752 || adminUserInfo.CurrentOrgId == 10697 || adminUserInfo.CurrentOrgId == 9478 {
 			if assessmentBeforeDislysis.ID == 0 {
 				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
 				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {

controllers/gobal_config_api_controller.go

@@ -1150,6 +1150,13 @@ func (c *GobalConfigApiController) GetPrintInfo() {
 	idsInters := dataBody["ids"].([]interface{})
 	advice_type, _ := c.GetInt64("advice_type")
 	stop_type, _ := c.GetInt64("stop_type")
+	his_str := c.GetString("his_str")
+	if len(his_str) == 0 {
+		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	idStrs := strings.Split(his_str, ",")
 	if len(idsInters) == 0 {
 		if err != nil {
 			c.ServeFailJsonSend(enums.ErrorCodeDBDelete, "删除会员失败:（没有选择会员）")
@@ -1161,9 +1168,13 @@ func (c *GobalConfigApiController) GetPrintInfo() {
 		id := int64(idsInter.(float64))
 		ids = append(ids, id)
 	}
+
 	getPrint, err := service.GetPrint(ids, OrgID, advice_type, stop_type)
+
+	hisPrint, _ := service.GetHisPrint(idStrs, OrgID)
 	c.ServeSuccessJSON(map[string]interface{}{
-		"doctoradvice": getPrint,
+		"doctoradvice":    getPrint,
+		"hisdoctoradvice": hisPrint,
 	})
 }
 

controllers/his_api_controller.go

@@ -3494,7 +3494,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 || adminInfo.CurrentOrgId == 10567 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 {
+	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 || adminInfo.CurrentOrgId == 10751 || adminInfo.CurrentOrgId == 10752 || adminInfo.CurrentOrgId == 9478 {
 		if dataBody["prescriptions"] != nil && reflect.TypeOf(dataBody["prescriptions"]).String() == "[]interface {}" {
 			prescriptions, _ := dataBody["prescriptions"].([]interface{})
 
@@ -3857,8 +3857,6 @@ func (c *HisApiController) CreateHisPrescription() {
 
 											}
 
-											fmt.Println("s.ID==========================", s.ID)
-
 											if s.ID > 0 {
 												//查询改药品是否已经停用
 												base, _ := service.GetBasedrugById(s.DrugId, s.UserOrgId)

controllers/mobile_api_controllers/dialysis_api_controller.go

@@ -3536,6 +3536,230 @@ func (c *DialysisAPIController) Finish() {
 
 	}
 
+	//查找是否开启配置
+	//orderSetting, _ := service.GetDialysisOrderSetting(adminUserInfo.Org.Id)
+	////开启下机扣减
+	//if orderSetting.IsOpen == 1 {
+	//
+	//	//查询今日患者排班的模式
+	//	db := service.XTWriteDB()
+	//	// 开始外部循环的事务
+	//	tx := db.Begin()
+	//	// 在函数结束时处理事务回滚
+	//	defer func() {
+	//		if r := recover(); r != nil {
+	//			tx.Rollback()
+	//		}
+	//	}()
+	//
+	//	schedule, _ := service.GetDialysisOrderSchedule(id, recordDate.Unix(), adminUserInfo.Org.Id, tx)
+	//
+	//	if schedule.ModeId == 1 {
+	//		//扣减库存
+	//		service.ReducePatientCount(1, schedule.ModeId, id, tx)
+	//
+	//		patient, _ := service.GetSfPatientById(tx, id)
+	//		var over_count int64
+	//		if schedule.ModeId == 1 {
+	//			over_count = patient.HdCount
+	//		}
+	//		if schedule.ModeId == 2 {
+	//			over_count = patient.HdfCount
+	//		}
+	//
+	//		if schedule.ModeId == 3 {
+	//			over_count = patient.HdhpCount
+	//		}
+	//		if schedule.ModeId == 4 {
+	//			over_count = patient.HpCount
+	//		}
+	//		if schedule.ModeId == 5 {
+	//			over_count = patient.OtherCount
+	//		}
+	//		patientCountFlow := models.SfPatientCountFlow{
+	//			PatientId:      id,
+	//			ModeId:         schedule.ModeId,
+	//			Count:          1,
+	//			Status:         1,
+	//			Ctime:          time.Now().Unix(),
+	//			Mtime:          time.Now().Unix(),
+	//			RecordDate:     recordDate.Unix(),
+	//			UserOrgId:      adminUserInfo.Org.Id,
+	//			Creater:        adminUserInfo.AdminUser.Id,
+	//			IsType:         1,
+	//			OverCount:      over_count,
+	//			WarehouseOutId: 0,
+	//		}
+	//
+	//		service.CreatePatientCountFlow(patientCountFlow, tx)
+	//	}
+	//
+	//	if schedule.ModeId == 2 {
+	//
+	//		//扣减库存
+	//		service.ReducePatientCount(1, schedule.ModeId, id, tx)
+	//
+	//		patient, _ := service.GetSfPatientById(tx, id)
+	//		var over_count int64
+	//		if schedule.ModeId == 1 {
+	//			over_count = patient.HdCount
+	//		}
+	//		if schedule.ModeId == 2 {
+	//			over_count = patient.HdfCount
+	//		}
+	//
+	//		if schedule.ModeId == 3 {
+	//			over_count = patient.HdhpCount
+	//		}
+	//		if schedule.ModeId == 4 {
+	//			over_count = patient.HpCount
+	//		}
+	//		if schedule.ModeId == 5 {
+	//			over_count = patient.OtherCount
+	//		}
+	//		patientCountFlow := models.SfPatientCountFlow{
+	//			PatientId:      id,
+	//			ModeId:         schedule.ModeId,
+	//			Count:          1,
+	//			Status:         1,
+	//			Ctime:          time.Now().Unix(),
+	//			Mtime:          time.Now().Unix(),
+	//			RecordDate:     recordDate.Unix(),
+	//			UserOrgId:      adminUserInfo.Org.Id,
+	//			Creater:        adminUserInfo.AdminUser.Id,
+	//			IsType:         2,
+	//			OverCount:      over_count,
+	//			WarehouseOutId: 0,
+	//		}
+	//
+	//		service.CreatePatientCountFlow(patientCountFlow, tx)
+	//	}
+	//
+	//	if schedule.ModeId == 3 {
+	//
+	//		//扣减库存
+	//		service.ReducePatientCount(1, schedule.ModeId, id, tx)
+	//
+	//		patient, _ := service.GetSfPatientById(tx, id)
+	//		var over_count int64
+	//		if schedule.ModeId == 1 {
+	//			over_count = patient.HdCount
+	//		}
+	//		if schedule.ModeId == 2 {
+	//			over_count = patient.HdfCount
+	//		}
+	//
+	//		if schedule.ModeId == 3 {
+	//			over_count = patient.HdhpCount
+	//		}
+	//		if schedule.ModeId == 4 {
+	//			over_count = patient.HpCount
+	//		}
+	//		if schedule.ModeId == 5 {
+	//			over_count = patient.OtherCount
+	//		}
+	//		patientCountFlow := models.SfPatientCountFlow{
+	//			PatientId:      id,
+	//			ModeId:         schedule.ModeId,
+	//			Count:          1,
+	//			Status:         1,
+	//			Ctime:          time.Now().Unix(),
+	//			Mtime:          time.Now().Unix(),
+	//			RecordDate:     recordDate.Unix(),
+	//			UserOrgId:      adminUserInfo.Org.Id,
+	//			Creater:        adminUserInfo.AdminUser.Id,
+	//			IsType:         3,
+	//			OverCount:      over_count,
+	//			WarehouseOutId: 0,
+	//		}
+	//
+	//		service.CreatePatientCountFlow(patientCountFlow, tx)
+	//	}
+	//	if schedule.ModeId == 4 {
+	//
+	//		//扣减库存
+	//		service.ReducePatientCount(1, schedule.ModeId, id, tx)
+	//
+	//		patient, _ := service.GetSfPatientById(tx, id)
+	//		var over_count int64
+	//		if schedule.ModeId == 1 {
+	//			over_count = patient.HdCount
+	//		}
+	//		if schedule.ModeId == 2 {
+	//			over_count = patient.HdfCount
+	//		}
+	//
+	//		if schedule.ModeId == 3 {
+	//			over_count = patient.HdhpCount
+	//		}
+	//		if schedule.ModeId == 4 {
+	//			over_count = patient.HpCount
+	//		}
+	//		if schedule.ModeId == 5 {
+	//			over_count = patient.OtherCount
+	//		}
+	//		patientCountFlow := models.SfPatientCountFlow{
+	//			PatientId:      id,
+	//			ModeId:         schedule.ModeId,
+	//			Count:          1,
+	//			Status:         1,
+	//			Ctime:          time.Now().Unix(),
+	//			Mtime:          time.Now().Unix(),
+	//			RecordDate:     recordDate.Unix(),
+	//			UserOrgId:      adminUserInfo.Org.Id,
+	//			Creater:        adminUserInfo.AdminUser.Id,
+	//			IsType:         4,
+	//			OverCount:      over_count,
+	//			WarehouseOutId: 0,
+	//		}
+	//
+	//		service.CreatePatientCountFlow(patientCountFlow, tx)
+	//	}
+	//	if schedule.ModeId != 1 && schedule.ModeId != 2 && schedule.ModeId != 3 && schedule.ModeId != 4 {
+	//
+	//		//扣减库存
+	//		service.ReducePatientCount(1, schedule.ModeId, id, tx)
+	//
+	//		patient, _ := service.GetSfPatientById(tx, id)
+	//		var over_count int64
+	//		if schedule.ModeId == 1 {
+	//			over_count = patient.HdCount
+	//		}
+	//		if schedule.ModeId == 2 {
+	//			over_count = patient.HdfCount
+	//		}
+	//
+	//		if schedule.ModeId == 3 {
+	//			over_count = patient.HdhpCount
+	//		}
+	//		if schedule.ModeId == 4 {
+	//			over_count = patient.HpCount
+	//		}
+	//		if schedule.ModeId == 5 {
+	//			over_count = patient.OtherCount
+	//		}
+	//		patientCountFlow := models.SfPatientCountFlow{
+	//			PatientId:      id,
+	//			ModeId:         schedule.ModeId,
+	//			Count:          1,
+	//			Status:         1,
+	//			Ctime:          time.Now().Unix(),
+	//			Mtime:          time.Now().Unix(),
+	//			RecordDate:     recordDate.Unix(),
+	//			UserOrgId:      adminUserInfo.Org.Id,
+	//			Creater:        adminUserInfo.AdminUser.Id,
+	//			IsType:         5,
+	//			OverCount:      over_count,
+	//			WarehouseOutId: 0,
+	//		}
+	//
+	//		service.CreatePatientCountFlow(patientCountFlow, tx)
+	//	}
+	//
+	//	tx.Commit()
+	//	return
+	//}
+
 }
 
 func (c *DialysisAPIController) GetAllZone() {
@@ -3916,7 +4140,7 @@ func (this *DialysisAPIController) StartDialysis() {
 				ultrafiltration_rate = math.Floor(prescription.TargetUltrafiltration / float64(totalMin) * 60 * 1000)
 			}
 
-			if adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10745 {
+			if adminUserInfo.Org.Id == 10742 || adminUserInfo.Org.Id == 10740 || adminUserInfo.Org.Id == 10745 || adminUserInfo.Org.Id == 9478 {
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
 			}
 
@@ -4091,7 +4315,7 @@ func (this *DialysisAPIController) StartDialysis() {
 				}
 			}
 
-			if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10731 || adminUserInfo.Org.Id == 10727 {
+			if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10731 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10744 {
 				if prescription.ModeId == 2 {
 					totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
 					if totalMin == 0 {
@@ -5237,8 +5461,9 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 			}
 
 			//重庆塘坝卫生院
-			if adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10745 {
+			if adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10745 || adminInfo.Org.Id == 9478 {
 				ultrafiltration_rate = math.Floor(prescription.PrescriptionWater / float64(totalMin) * 60 * 1000)
+				fmt.Println("ultrafiltration_rate--------------------", ultrafiltration_rate)
 				record.UltrafiltrationRate = ultrafiltration_rate
 			}
 
@@ -5428,7 +5653,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 	}
 
 	//长沙南雅
-	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10610 || adminInfo.Org.Id == 10537 || adminInfo.Org.Id == 10667 {
+	if adminInfo.Org.Id == 10395 || adminInfo.Org.Id == 10138 || adminInfo.Org.Id == 10278 || adminInfo.Org.Id == 10432 || adminInfo.Org.Id == 10441 || adminInfo.Org.Id == 10445 || adminInfo.Org.Id == 10469 || adminInfo.Org.Id == 10375 || adminInfo.Org.Id == 10610 || adminInfo.Org.Id == 10537 || adminInfo.Org.Id == 10667 || adminInfo.Org.Id == 9478 {
 
 		if ultrafiltration_rate > 0 {
 			ultrafiltration_volume := math.Floor(float64(record.OperateTime+3600-fristrecord.OperateTime) / 3600 * ultrafiltration_rate)
@@ -5509,7 +5734,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		}
 	}
 
-	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10757 {
+	if adminInfo.Org.Id == 10721 || adminInfo.Org.Id == 10757 || adminInfo.Org.Id == 9478 || adminInfo.Org.Id == 10290 {
 		var replacement_rate float64
 		var displacement_quantity float64
 		totalMin := prescription.DialysisDurationHour*60 + prescription.DialysisDurationMinute
@@ -5533,7 +5758,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 
 	}
 
-	if adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10745 {
+	if adminInfo.Org.Id == 10740 || adminInfo.Org.Id == 10742 || adminInfo.Org.Id == 10745 || adminInfo.Org.Id == 9478 {
 
 		var replacement_rate float64
 		var displacement_quantity float64
@@ -5552,7 +5777,7 @@ func (this *DialysisAPIController) GetLastMonitorRecordTody() {
 		record.UltrafiltrationVolume = ultrafiltration_volume
 	}
 
-	if adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10727 {
+	if adminInfo.Org.Id == 10731 || adminInfo.Org.Id == 10727 || adminInfo.Org.Id == 10744 {
 
 		var replacement_rate float64
 		var displacement_quantity float64

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3878,9 +3878,9 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	if evaluation.DryWeight > 0 {
 		dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
 
-		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 {
+		if template.TemplateId == 17 || template.TemplateId == 22 || template.TemplateId == 21 || template.TemplateId == 26 || template.TemplateId == 34 || template.TemplateId == 32 || adminUserInfo.Org.Id == 10469 || adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10551 || adminUserInfo.Org.Id == 10579 || adminUserInfo.Org.Id == 10580 || adminUserInfo.Org.Id == 10585 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10727 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 || adminUserInfo.Org.Id == 9478 {
 
-			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 && adminUserInfo.Org.Id != 10752 {
+			if adminUserInfo.Org.Id != 10551 && adminUserInfo.Org.Id != 10579 && adminUserInfo.Org.Id != 10580 && adminUserInfo.Org.Id != 10585 && adminUserInfo.Org.Id != 10752 && adminUserInfo.Org.Id != 9478 {
 				dewater_amount = dewater_amount * 1000
 			}
 
@@ -4603,7 +4603,7 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 	}
 
 	//针对孝昌康桥超滤率计算问题
-	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 {
+	if adminUserInfo.Org.Id == 10702 || adminUserInfo.Org.Id == 10635 || adminUserInfo.Org.Id == 10721 || adminUserInfo.Org.Id == 10726 || adminUserInfo.Org.Id == 10164 || adminUserInfo.Org.Id == 10751 || adminUserInfo.Org.Id == 10752 || adminUserInfo.Org.Id == 10757 || adminUserInfo.Org.Id == 9478 {
 		if evaluation.ID == 0 {
 			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {

controllers/new_mobile_api_controllers/staff_schedule_api_controller.go

@@ -407,7 +407,7 @@ func (this *StaffScheduleApiController) GetAllZonePb() {
 	timenow := time.Now().Format("2006-01-02")
 	timeNewDate, _ := utils.ParseTimeStringToTime("2006-01-02", timenow)
 	//针对百霖和贝尔
-	if orgid == 10138 || orgid == 10278 || orgid == 3877 {
+	if orgid == 10138 || orgid == 10278 || orgid == 3877 || orgid == 10610 || orgid == 10537 {
 		//获取今日的排班数据
 		list, _ := service.GetMobileScheduleListByScheduleDate(orgid, startTime)
 		for _, item := range list {
@@ -1629,3 +1629,21 @@ func (c *StaffScheduleApiController) GetMobileDialysisCount() {
 		"order": order,
 	})
 }
+
+func (c *StaffScheduleApiController) GetPatientialysisSolutonByPatientId() {
+
+	patient_id, _ := c.GetInt64("patient_id")
+
+	record_date, _ := c.GetInt64("record_date")
+
+	orgId := c.GetAdminUserInfo().CurrentOrgId
+
+	schedule, _ := service.GetPatientScheduleByPatient(patient_id, record_date, orgId)
+
+	dialysisSolution, _ := service.GetDialysisSolutonByScheduleModeId(schedule.ModeId, patient_id, orgId)
+
+	c.ServeSuccessJSON(map[string]interface{}{
+		"dialysisSolution": dialysisSolution,
+	})
+
+}

controllers/new_mobile_api_controllers/staff_schedule_api_router.go

@@ -42,4 +42,6 @@ func StaffScheduleApiControllersRegisterRouters() {
 
 	beego.Router("/m/api/patient/getmobiledialysiscount", &StaffScheduleApiController{}, "Get:GetMobileDialysisCount")
 
+	beego.Router("/api/schedule/getpatientdialysissolutionbypatientid", &StaffScheduleApiController{}, "Get:GetPatientialysisSolutonByPatientId")
+
 }

controllers/patient_api_controller.go

@@ -233,7 +233,31 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/checkpatientcount", &PatientApiController{}, "Get:CheckPatientCount")
 
-	beego.Router("/api/patient/returncheckpatientcount", &PatientApiController{}, "Get:ReturnCheckPatientCount")
+	beego.Router("/api/patient/returncheck", &PatientApiController{}, "Get:ReturnCheckPatientCount")
+
+	beego.Router("/api/patient/deletepatientcount", &PatientApiController{}, "Get:DeletePatientCount")
+
+	beego.Router("/api/patient/savepatientoutcount", &PatientApiController{}, "Get:SavePatientOutCount")
+
+	beego.Router("/api/patient/getpatientoutcountlist", &PatientApiController{}, "Get:GetPatientOutCountList")
+
+	beego.Router("/api/patient/deletepatientoutcount", &PatientApiController{}, "Get:DeletePatientOutCount")
+
+	beego.Router("/api/patient/checkpatientoutcount", &PatientApiController{}, "Get:CheckPatientOutCount")
+
+	beego.Router("/api/patient/returnpatientoutlist", &PatientApiController{}, "Get:ReturnPatientOutList")
+
+	beego.Router("/api/patient/getpatientcountmaplist", &PatientApiController{}, "Get:GetPatientCountMapList")
+
+	beego.Router("/api/patient/getpatientcountflow", &PatientApiController{}, "Get:GetPatientCountFlow")
+
+	beego.Router("/api/patient/getdialysisordersetting", &PatientApiController{}, "Get:GetDialysisOrderSetting")
+
+	beego.Router("/api/patient/savepatientordersetting", &PatientApiController{}, "Get:SavePatientOrderSetting")
+
+	beego.Router("/api/patient/getpatientcountflowlist", &PatientApiController{}, "Get:GetPatientCountFlowList")
+
+	beego.Router("/api/patient/getpatientcountflowbyid", &PatientApiController{}, "Get:GetPatientCountFlowById")
 
 }
 func (c *PatientApiController) GetExportList() {
@@ -9111,25 +9135,6 @@ func (this *PatientApiController) SavePatientCount() {
 
 	nowtime := recordDate.Unix()
 
-	patientInCount := models.SfPatientInCount{
-		PatientId:  patient_id,
-		UserOrgId:  orgId,
-		HdCount:    hd_count,
-		HdfCount:   hdf_count,
-		HdhpCount:  hdhp_count,
-		HpCount:    hp_count,
-		Status:     1,
-		Creater:    creater,
-		Ctime:      time.Now().Unix(),
-		Mtime:      time.Now().Unix(),
-		IsCheck:    2,
-		RecordDate: nowtime,
-		Remark:     remark,
-		OtherCount: other_count,
-	}
-
-	fmt.Println(patientInCount)
-
 	db := service.XTWriteDB()
 	// 开始外部循环的事务
 	tx := db.Begin()
@@ -9140,14 +9145,110 @@ func (this *PatientApiController) SavePatientCount() {
 		}
 	}()
 
-	service.CreatePatientInCount(tx, patientInCount)
+	if hd_count > 0 {
+		patientInCount := models.SfPatientInCount{
+			PatientId:  patient_id,
+			UserOrgId:  orgId,
+			IsType:     1,
+			Count:      hd_count,
+			Status:     1,
+			Creater:    creater,
+			Ctime:      time.Now().Unix(),
+			Mtime:      time.Now().Unix(),
+			IsCheck:    2,
+			RecordDate: nowtime,
+			Remark:     remark,
+			StockCount: hd_count,
+		}
+
+		service.CreatePatientInCount(tx, patientInCount)
+
+	}
+
+	if hdf_count > 0 {
+
+		patientInCount := models.SfPatientInCount{
+			PatientId:  patient_id,
+			UserOrgId:  orgId,
+			IsType:     2,
+			Count:      hdf_count,
+			Status:     1,
+			Creater:    creater,
+			Ctime:      time.Now().Unix(),
+			Mtime:      time.Now().Unix(),
+			IsCheck:    2,
+			RecordDate: nowtime,
+			Remark:     remark,
+			StockCount: hdf_count,
+		}
+
+		service.CreatePatientInCount(tx, patientInCount)
+
+	}
+
+	if hdhp_count > 0 {
+
+		patientInCount := models.SfPatientInCount{
+			PatientId:  patient_id,
+			UserOrgId:  orgId,
+			IsType:     3,
+			Count:      hdhp_count,
+			Status:     1,
+			Creater:    creater,
+			Ctime:      time.Now().Unix(),
+			Mtime:      time.Now().Unix(),
+			IsCheck:    2,
+			RecordDate: nowtime,
+			Remark:     remark,
+			StockCount: hdhp_count,
+		}
+
+		service.CreatePatientInCount(tx, patientInCount)
+	}
+
+	if hp_count > 0 {
+
+		patientInCount := models.SfPatientInCount{
+			PatientId:  patient_id,
+			UserOrgId:  orgId,
+			IsType:     4,
+			Count:      hp_count,
+			Status:     1,
+			Creater:    creater,
+			Ctime:      time.Now().Unix(),
+			Mtime:      time.Now().Unix(),
+			IsCheck:    2,
+			RecordDate: nowtime,
+			Remark:     remark,
+			StockCount: hp_count,
+		}
+		service.CreatePatientInCount(tx, patientInCount)
+	}
+
+	if other_count > 0 {
+
+		patientInCount := models.SfPatientInCount{
+			PatientId:  patient_id,
+			UserOrgId:  orgId,
+			IsType:     5,
+			Count:      other_count,
+			Status:     1,
+			Creater:    creater,
+			Ctime:      time.Now().Unix(),
+			Mtime:      time.Now().Unix(),
+			IsCheck:    2,
+			RecordDate: nowtime,
+			Remark:     remark,
+			StockCount: other_count,
+		}
 
-	service.ModifyPatientCount(tx, hd_count, hdf_count, hdhp_count, hp_count, patient_id)
+		service.CreatePatientInCount(tx, patientInCount)
+	}
 
 	tx.Commit()
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"patientInCount": patientInCount,
+		"msg": "保存成功",
 	})
 
 }
@@ -9155,14 +9256,43 @@ func (this *PatientApiController) SavePatientCount() {
 func (this *PatientApiController) GetPatientCountList() {
 
 	orgId := this.GetAdminUserInfo().CurrentOrgId
+	appId := this.GetAdminUserInfo().CurrentAppId
 	patient_id, _ := this.GetInt64("patient_id")
 	page, _ := this.GetInt64("page")
 	limit, _ := this.GetInt64("limit")
-	patient, total, _ := service.GetPatientCountList(orgId, patient_id, page, limit)
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	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()
+	}
+	list, total, _ := service.GetPatientCountList(orgId, patient_id, page, limit, startTime, endTime)
+	patient, _ := service.GetPatientMapListOne(orgId)
+
+	userList, _ := service.GetAllAdminUserList(orgId, appId)
 
 	this.ServeSuccessJSON(map[string]interface{}{
-		"patient": patient,
-		"total":   total,
+		"list":     list,
+		"total":    total,
+		"patient":  patient,
+		"userList": userList,
 	})
 }
 
@@ -9170,7 +9300,64 @@ func (this *PatientApiController) CheckPatientCount() {
 
 	id, _ := this.GetInt64("id")
 
-	checkpatientcount, _ := service.CheckPatientCount(id)
+	db := service.XTWriteDB()
+	// 开始外部循环的事务
+	tx := db.Begin()
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	creater := this.GetAdminUserInfo().AdminUser.Id
+
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+	warehouseInfo, _ := service.GetPatientCountById(id, tx)
+
+	if warehouseInfo.ID > 0 {
+		service.ModiftyPatientCount(warehouseInfo.Count, warehouseInfo.IsType, warehouseInfo.PatientId, tx)
+		patient, _ := service.GetSfPatientById(tx, warehouseInfo.PatientId)
+
+		var over_count int64
+		if warehouseInfo.IsType == 1 {
+			over_count = patient.HdCount
+		}
+		if warehouseInfo.IsType == 2 {
+			over_count = patient.HdfCount
+		}
+
+		if warehouseInfo.IsType == 3 {
+			over_count = patient.HdhpCount
+		}
+		if warehouseInfo.IsType == 4 {
+			over_count = patient.HpCount
+		}
+		if warehouseInfo.IsType == 5 {
+			over_count = patient.OtherCount
+		}
+		patientCountFlow := models.SfPatientCountFlow{
+			UserOrgId:       warehouseInfo.UserOrgId,
+			Count:           warehouseInfo.Count,
+			ModeId:          warehouseInfo.IsType,
+			IsType:          1,
+			PatientId:       warehouseInfo.PatientId,
+			Status:          1,
+			Ctime:           time.Now().Unix(),
+			Mtime:           time.Now().Unix(),
+			OverCount:       over_count,
+			RecordDate:      recordDate.Unix(),
+			Creater:         creater,
+			WarehouseInfoId: warehouseInfo.ID,
+		}
+		service.CreatePatientCountFlow(patientCountFlow, tx)
+	}
+
+	checkpatientcount, _ := service.CheckPatientCount(id, tx)
+
+	tx.Commit()
 
 	this.ServeSuccessJSON(map[string]interface{}{
 		"checkpatientcount": checkpatientcount,
@@ -9191,11 +9378,13 @@ func (this *PatientApiController) ReturnCheckPatientCount() {
 		}
 	}()
 
-	patientCount, _ := service.ReturnCheckPatientCount(id)
+	patientCountObj, _ := service.GetPatientCountById(id, tx)
 
-	patientCountObj, _ := service.GetPatientCountById(id)
+	service.ReducePatientCount(patientCountObj.Count, patientCountObj.IsType, patientCountObj.PatientId, tx)
 
-	service.UpdatePatientInCount(tx, patientCountObj.HdCount, patientCountObj.HdfCount, patientCountObj.HdhpCount, patientCountObj.HpCount, patientCountObj.PatientId)
+	patientCount, _ := service.ReturnCheckPatientCount(id, tx)
+
+	service.UpdatePatientCountFlow(id, tx)
 
 	tx.Commit()
 	this.ServeSuccessJSON(map[string]interface{}{
@@ -9203,3 +9392,423 @@ func (this *PatientApiController) ReturnCheckPatientCount() {
 	})
 
 }
+
+func (this *PatientApiController) DeletePatientCount() {
+
+	id, _ := this.GetInt64("id")
+
+	service.DeletePatientCount(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "删除成功!",
+	})
+
+}
+
+func (this *PatientApiController) SavePatientOutCount() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	count, _ := this.GetInt64("count")
+
+	remark := this.GetString("remark")
+
+	mode_id, _ := this.GetInt64("mode_id")
+
+	creater := this.GetAdminUserInfo().AdminUser.Id
+
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	sfPatientOutCount := models.SfPatientOutCount{
+		UserOrgId:  orgId,
+		PatientId:  patient_id,
+		ModeId:     mode_id,
+		Count:      count,
+		Remark:     remark,
+		Creater:    creater,
+		Status:     1,
+		Ctime:      time.Now().Unix(),
+		Mtime:      time.Now().Unix(),
+		IsCheck:    2,
+		RecordDate: recordDate.Unix(),
+	}
+
+	service.CreateSfPatientOutCount(sfPatientOutCount)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "保存成功!",
+	})
+
+}
+
+func (this *PatientApiController) GetPatientOutCountList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	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()
+	}
+
+	outcount, total, _ := service.GetPatientOutCountList(patient_id, orgId, limit, page, startTime, endTime)
+
+	patient, _ := service.GetPatientMapListOne(orgId)
+
+	appId := this.GetAdminUserInfo().CurrentAppId
+	userList, _ := service.GetAllAdminUserList(orgId, appId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":     outcount,
+		"total":    total,
+		"patient":  patient,
+		"userList": userList,
+	})
+
+}
+
+func (this *PatientApiController) DeletePatientOutCount() {
+
+	id, _ := this.GetInt64("id")
+
+	service.DeletePatientOutCount(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+
+}
+
+func (this *PatientApiController) CheckPatientOutCount() {
+
+	id, _ := this.GetInt64("id")
+	db := service.XTWriteDB()
+	// 开始外部循环的事务
+	tx := db.Begin()
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+	outCountList, _ := service.GetPatientOutCountById(id, tx)
+
+	creater := this.GetAdminUserInfo().AdminUser.Id
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+	if outCountList.ID > 0 {
+
+		//扣减库存
+		service.ReducePatientCount(outCountList.Count, outCountList.ModeId, outCountList.PatientId, tx)
+
+		patient, _ := service.GetSfPatientById(tx, outCountList.PatientId)
+
+		var over_count int64
+		if outCountList.ModeId == 1 {
+			over_count = patient.HdCount
+		}
+		if outCountList.ModeId == 2 {
+			over_count = patient.HdfCount
+		}
+
+		if outCountList.ModeId == 3 {
+			over_count = patient.HdhpCount
+		}
+		if outCountList.ModeId == 4 {
+			over_count = patient.HpCount
+		}
+		if outCountList.ModeId == 5 {
+			over_count = patient.OtherCount
+		}
+
+		patientCountFlow := models.SfPatientCountFlow{
+			PatientId:      outCountList.PatientId,
+			ModeId:         outCountList.ModeId,
+			Count:          outCountList.Count,
+			Status:         1,
+			Ctime:          time.Now().Unix(),
+			Mtime:          time.Now().Unix(),
+			RecordDate:     recordDate.Unix(),
+			UserOrgId:      orgId,
+			Creater:        creater,
+			IsType:         2,
+			OverCount:      over_count,
+			WarehouseOutId: outCountList.ID,
+		}
+
+		service.CreatePatientCountFlow(patientCountFlow, tx)
+
+	}
+	//审核
+	service.CheckPatientOutCount(id, tx)
+
+	tx.Commit()
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+
+}
+
+func (this *PatientApiController) ReturnPatientOutList() {
+
+	id, _ := this.GetInt64("id")
+	db := service.XTWriteDB()
+	// 开始外部循环的事务
+	tx := db.Begin()
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+	outCountList, _ := service.GetPatientOutCountById(id, tx)
+
+	if outCountList.ID > 0 {
+		//回退库存
+		service.ModiftyPatientCount(outCountList.Count, outCountList.ModeId, outCountList.PatientId, tx)
+
+		service.DeletePatientCountFlow(id, tx)
+	}
+	//反审核
+	service.ReturnPatientOutCount(id, tx)
+
+	tx.Commit()
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "ok",
+	})
+}
+
+func (this *PatientApiController) GetPatientCountMapList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	list, total, _ := service.GetPatientCountMapList(patient_id, limit, page, orgId)
+
+	patient, _ := service.GetPatientMapListOne(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":    list,
+		"total":   total,
+		"patient": patient,
+	})
+}
+
+func (this *PatientApiController) GetPatientCountFlow() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+	is_type, _ := this.GetInt64("is_type")
+	mode_id, _ := this.GetInt64("mode_id")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	start_time := this.GetString("start_time")
+	end_time := this.GetString("end_time")
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	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()
+	}
+
+	list, total, _ := service.GetPatientCountFlow(patient_id, orgId, is_type, mode_id, startTime, endTime)
+
+	patient, _ := service.GetSfPatientByIdOne(patient_id)
+
+	appId := this.GetAdminUserInfo().CurrentAppId
+	userList, _ := service.GetAllAdminUserList(orgId, appId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":     list,
+		"total":    total,
+		"patient":  patient,
+		"userList": userList,
+	})
+}
+
+func (this *PatientApiController) GetDialysisOrderSetting() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	order, _ := service.GetDialysisOrderSetting(orgId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"order": order,
+	})
+}
+
+func (this *PatientApiController) SavePatientOrderSetting() {
+
+	is_open, _ := this.GetInt64("is_open")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	orderSetting := models.XtDialysisOrderSetting{
+		IsOpen:    is_open,
+		UserOrgId: orgId,
+		Ctime:     time.Now().Unix(),
+		Mtime:     time.Now().Unix(),
+		Status:    1,
+	}
+
+	service.CreateDialysisOrder(orderSetting)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"order": orderSetting,
+	})
+}
+
+func (this *PatientApiController) GetPatientCountFlowList() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	limit, _ := this.GetInt64("limit")
+
+	page, _ := this.GetInt64("page")
+
+	is_type, _ := this.GetInt64("is_type")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	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()
+	}
+
+	list, total, _ := service.GetPatientCountFlowList(patient_id, startTime, endTime, limit, page, orgId, is_type)
+
+	flowList, _ := service.GetPatientCountListFlowOne(patient_id, startTime, endTime, is_type, orgId)
+
+	patient, _ := service.GetPatientMapListOne(orgId)
+
+	appId := this.GetAdminUserInfo().CurrentAppId
+	userList, _ := service.GetAllAdminUserList(orgId, appId)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":     list,
+		"total":    total,
+		"patient":  patient,
+		"userList": userList,
+		"flowList": flowList,
+	})
+}
+
+func (this *PatientApiController) GetPatientCountFlowById() {
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	start_time := this.GetString("start_time")
+
+	end_time := this.GetString("end_time")
+
+	is_type, _ := this.GetInt64("is_type")
+
+	mode_id, _ := this.GetInt64("mode_id")
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	appId := this.GetAdminUserInfo().CurrentAppId
+
+	timeLayout := "2006-01-02"
+	loc, _ := time.LoadLocation("Local")
+	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()
+	}
+
+	flowList, _ := service.GetPatientCountFlowByIdList(patient_id, orgId, mode_id, is_type, startTime, endTime)
+
+	patient, _ := service.GetPatientMapListOne(orgId)
+
+	userList, _ := service.GetAllAdminUserList(orgId, appId)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"list":     flowList,
+		"patient":  patient,
+		"userList": userList,
+	})
+}

controllers/pharmacy_controller.go

@@ -1469,7 +1469,10 @@ func (this *PharmacyController) GetDrugTocalCount() {
 
 	adviceList, _ := service.GetDrugTocalCountByDrugId(drug_id, startTime, orgId)
 
+	drug, _ := service.GetNewBaseDrugById(drug_id)
+
 	this.ServeSuccessJSON(map[string]interface{}{
 		"adviceList": adviceList,
+		"drug":       drug,
 	})
 }

controllers/statistics_api_controller.go

@@ -1,17 +1,18 @@
 package controllers
 
 import (
+	"fmt"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
 	"XT_New/service/statistics_service"
 	"XT_New/utils"
-	"fmt"
 	"github.com/astaxie/beego"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type StatisticsApiController struct {
@@ -497,28 +498,7 @@ func (c *StatisticsApiController) GetDialysisTotalDetail() {
 	mode, _ := c.GetInt64("mode")
 	origin, _ := c.GetInt64("origin")
 	time_way, _ := c.GetInt64("time_way")
-	//timeLayout := "2006-01-02"
-	//loc, _ := time.LoadLocation("Local")
-	//var startTime int64
-	//if len(start_date) > 0 {
-	//	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_date+" 00:00:00", loc)
-	//	fmt.Println("err-----------", err)
-	//	if err != nil {
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//	//startTime = theTime.Unix()
-	//}
-	//var endTime int64
-	//if len(end_date) > 0 {
-	//	theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", end_date+" 23:59:59", loc)
-	//	if err != nil {
-	//		utils.ErrorLog(err.Error())
-	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
-	//		return
-	//	}
-	//	//endTime = theTime.Unix()
-	//}
+
 	dates, err := splitDateRange(start_date, end_date)
 	if err != nil {
 		fmt.Println("Error:", err)
@@ -1833,7 +1813,7 @@ func (c *StatisticsApiController) GetPatientCommonInspectionStatistisc() {
 	var startTime int64
 	if len(start_date) > 0 {
 		theTime, err := time.ParseInLocation(timeLayout+" 15:04:05", start_date+" 00:00:00", loc)
-		fmt.Println("err-----------", err)
+
 		if err != nil {
 			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
 			return

models/dialysis.go

@@ -346,7 +346,7 @@ type PredialysisEvaluationList struct {
 	SystolicBloodPressure  float64 `gorm:"column:systolic_blood_pressure" json:"systolic_blood_pressure"`
 	DiastolicBloodPressure float64 `gorm:"column:diastolic_blood_pressure" json:"diastolic_blood_pressure"`
 	DryWeight              float64 `gorm:"column:dry_weight" json:"dry_weight"`
-	Height                 int64   `gorm:"column:height" json:"height" form:"height"`
+	Height                 string  `gorm:"column:height" json:"height" form:"height"`
 }
 
 func (PredialysisEvaluationList) TableName() string {

models/his_models.go

@@ -3091,3 +3091,33 @@ type NewHisPrescription struct {
 func (NewHisPrescription) TableName() string {
 	return "his_prescription"
 }
+
+type NBHisDoctorAdviceInfo 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"`
+	AdviceDate            int64   `gorm:"column:advice_date" json:"advice_date" form:"advice_date"`
+	AdviceName            string  `gorm:"column:advice_name" json:"advice_name" form:"advice_name"`
+	PrescribingNumber     float64 `gorm:"column:prescribing_number" json:"prescribing_number" form:"prescribing_number"`
+	PrescribingNumberUnit string  `gorm:"column:prescribing_number_unit" json:"prescribing_number_unit" form:"prescribing_number_unit"`
+	AdviceDoctor          int64   `gorm:"column:advice_doctor" json:"advice_doctor" form:"advice_doctor"`
+	Status                int64   `gorm:"column:status" json:"status" form:"status"`
+	DrugId                int64   `gorm:"column:drug_id" json:"drug_id" form:"drug_id"`
+	DrugCode              string  `gorm:"column:drug_code" json:"drug_code" form:"drug_code"`
+}
+
+func (NBHisDoctorAdviceInfo) TableName() string {
+	return "his_doctor_advice_info"
+}
+
+type NBXtBaseDrug struct {
+	ID       int64  `gorm:"column:id" json:"id" form:"id"`
+	DrugName string `gorm:"column:drug_name" json:"drug_name" form:"drug_name"`
+	Status   int64  `gorm:"column:status" json:"status" form:"status"`
+	OrgId    int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	ScanCode string `gorm:"column:scan_code" json:"scan_code" form:"scan_code"`
+}
+
+func (NBXtBaseDrug) TableName() string {
+	return "xt_base_drug"
+}

models/patient_models.go

@@ -3134,6 +3134,7 @@ type SfPatients struct {
 	HdfCount    int64  `gorm:"column:hdf_count" json:"hdf_count" form:"hdf_count"`
 	HdhpCount   int64  `gorm:"column:hdhp_count" json:"hdhp_count" form:"hdhp_count"`
 	HpCount     int64  `gorm:"column:hp_count" json:"hp_count" form:"hp_count"`
+	OtherCount  int64  `gorm:"column:other_count" json:"other_count" form:"other_count"`
 }
 
 func (SfPatients) TableName() string {
@@ -3144,10 +3145,7 @@ type SfPatientInCount struct {
 	ID         int64  `gorm:"column:id" json:"id" form:"id"`
 	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
 	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
-	HdCount    int64  `gorm:"column:hd_count" json:"hd_count" form:"hd_count"`
-	HdfCount   int64  `gorm:"column:hdf_count" json:"hdf_count" form:"hdf_count"`
-	HdhpCount  int64  `gorm:"column:hdhp_count" json:"hdhp_count" form:"hdhp_count"`
-	HpCount    int64  `gorm:"column:hp_count" json:"hp_count" form:"hp_count"`
+	IsType     int64  `gorm:"column:is_type" json:"is_type" form:"is_type"`
 	Status     int64  `gorm:"column:status" json:"status" form:"status"`
 	Creater    int64  `gorm:"column:creater" json:"creater" form:"creater"`
 	Ctime      int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
@@ -3155,9 +3153,63 @@ type SfPatientInCount struct {
 	IsCheck    int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
 	RecordDate int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
 	Remark     string `gorm:"column:remark" json:"remark" form:"remark"`
-	OtherCount int64  `gorm:"column:other_count" json:"other_count" form:"other_count"`
+	Count      int64  `gorm:"column:count" json:"count" form:"count"`
+	StockCount int64  `gorm:"column:stock_count" json:"stock_count" form:"stock_count"`
 }
 
 func (SfPatientInCount) TableName() string {
 	return "xt_patient_in_count"
 }
+
+type SfPatientOutCount struct {
+	ID         int64  `gorm:"column:id" json:"id" form:"id"`
+	PatientId  int64  `gorm:"column:patient_id" json:"patient_id" form:"patient_id"`
+	ModeId     int64  `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	Count      int64  `gorm:"column:count" json:"count" form:"count"`
+	Remark     string `gorm:"column:remark" json:"remark" form:"remark"`
+	Creater    int64  `gorm:"column:creater" json:"creater" form:"creater"`
+	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"`
+	IsCheck    int64  `gorm:"column:is_check" json:"is_check" form:"is_check"`
+	RecordDate int64  `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	UserOrgId  int64  `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+}
+
+func (SfPatientOutCount) TableName() string {
+	return "xt_patient_out_count"
+}
+
+type SfPatientCountFlow 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"`
+	Count           int64 `gorm:"column:count" json:"count" form:"count"`
+	ModeId          int64 `gorm:"column:mode_id" json:"mode_id" form:"mode_id"`
+	IsType          int64 `gorm:"column:is_type" json:"is_type" form:"is_type"`
+	PatientId       int64 `gorm:"column:patient_id" json:"patient_id" form:"patient_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"`
+	OverCount       int64 `gorm:"column:over_count" json:"over_count" form:"over_count"`
+	RecordDate      int64 `gorm:"column:record_date" json:"record_date" form:"record_date"`
+	Creater         int64 `gorm:"column:creater" json:"creater" form:"creater"`
+	WarehouseInfoId int64 `gorm:"column:warehouse_info_id" json:"warehouse_info_id" form:"warehouse_info_id"`
+	WarehouseOutId  int64 `gorm:"column:warehouse_out_id" json:"warehouse_out_id" form:"warehouse_out_id"`
+}
+
+func (SfPatientCountFlow) TableName() string {
+	return "xt_patient_count_flow"
+}
+
+type XtDialysisOrderSetting struct {
+	ID        int64 `gorm:"column:id" json:"id" form:"id"`
+	IsOpen    int64 `gorm:"column:is_open" json:"is_open" form:"is_open"`
+	UserOrgId int64 `gorm:"column:user_org_id" json:"user_org_id" form:"user_org_id"`
+	Ctime     int64 `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime     int64 `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	Status    int64 `gorm:"column:status" json:"status" form:"status"`
+}
+
+func (XtDialysisOrderSetting) TableName() string {
+	return "xt_dialysis_order_setting"
+}

service/common_service.go

@@ -293,13 +293,7 @@ func GetTotalRollOutPatientsTwo(orgid int64, startime int64, endtime int64, laps
 
 func GetPatientTotalCount(orgID int64, lapsetotype int64, sourcetype int64) (total int64) {
 	db := readDb.Table("xt_patients as x")
-	//if lapsetotype > 0 {
-	// db = db.Where("x.lapseto = ?", lapsetotype)
-	//}
-	//if sourcetype > 0 {
-	// db = db.Where("x.source = ?", sourcetype)
-	//}
-	db.Where("x.user_org_id=? and x.status=1", orgID).Count(&total)
+	db.Where("x.user_org_id=? and x.status=1 and x.patient_type=1", orgID).Count(&total)
 	return
 }
 
@@ -321,7 +315,7 @@ func GetManPatientTotalCount(orgid int64, starttime int64, endtime int64) (dialy
 
 func GetManPatientTotal(orgid int64, lapsetotype int64, sourcetype int64) (patients []*models.XtPatients, total int64, err error) {
 
-	db := XTReadDB().Table("xt_patients as x").Where("x.status  = 1")
+	db := XTReadDB().Table("xt_patients as x").Where("x.status  = 1 and x.patient_type =1")
 	if lapsetotype > 0 {
 		db = db.Where("x.lapseto = ?", lapsetotype)
 	}
@@ -333,7 +327,7 @@ func GetManPatientTotal(orgid int64, lapsetotype int64, sourcetype int64) (patie
 }
 
 func GetWoManPatientTotal(orgid int64, lapsetotype int64, sourcetype int64) (patients []*models.XtPatients, total int64, err error) {
-	db := XTReadDB().Table("xt_patients as x").Where("x.status  = 1")
+	db := XTReadDB().Table("xt_patients as x").Where("x.status  = 1 and x.patient_type =1")
 	if lapsetotype > 0 {
 		db = db.Where("x.lapseto = ?", lapsetotype)
 	}
@@ -352,18 +346,18 @@ func GetWoManPatientTotal(orgid int64, lapsetotype int64, sourcetype int64) (pat
 func GetPatientInfectiousCount(orgid int64, startime int64, endtime int64, lapsetotype int64, sourcetype int64) (counts []*models.PatientContagionsCountStruct, err error) {
 
 	if lapsetotype == 0 {
-		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and x.status = 1 and x.updated_time>=? and x.updated_time<=?", orgid, startime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and s.patient_type =1 and x.status = 1 and x.updated_time>=? and x.updated_time<=?", orgid, startime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
 	}
 	if sourcetype == 0 {
-		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and x.status = 1 and x.updated_time>=? and x.updated_time<=?", orgid, startime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and s.patient_type =1 and x.status = 1 and x.updated_time>=? and x.updated_time<=?", orgid, startime, endtime).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
 	}
 
 	if lapsetotype > 0 {
-		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and x.status = 1 and x.updated_time>=? and x.updated_time<=? and s.lapseto = ?", orgid, startime, endtime, lapsetotype).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and s.patient_type =1 and x.status = 1 and x.updated_time>=? and x.updated_time<=? and s.lapseto = ?", orgid, startime, endtime, lapsetotype).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
 	}
 
 	if sourcetype > 0 {
-		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and x.status = 1 and x.updated_time>=? and x.updated_time<=? and s.source = ?", orgid, startime, endtime, sourcetype).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
+		err = readDb.Table("xt_patients_infectious_diseases as x").Joins("join xt_patients as s on s.id = x.patient_id").Where("s.user_org_id = ? and s.status = 1 and s.patient_type =1 and x.status = 1 and x.updated_time>=? and x.updated_time<=? and s.source = ?", orgid, startime, endtime, sourcetype).Select("x.disease_id,count(x.disease_id) as count").Group("x.disease_id").Scan(&counts).Error
 	}
 
 	return counts, err
@@ -388,7 +382,7 @@ func GetTotalAgeCount(orgid int64, lapsetotype int64, sourcetype int64) (counts
     WHEN ( substring( now( ), 1, 4 ) - substring( id_card_no, 7, 4 ) ) - ( substring( id_card_no, 11, 4 ) - date_format( now( ), '%m%d' ) > 0 )<=80 THEN '80'
     ELSE '150'
 	 END
-	 AS nnd FROM xt_patients as s  where s.user_org_id=? and s.status=1
+	 AS nnd FROM xt_patients as s  where s.user_org_id=? and s.status=1 and s.patient_type =1
 	 )a GROUP BY nnd`, orgid).Scan(&counts)
 
 	}

service/gobal_config_service.go

@@ -202,6 +202,12 @@ func GetPrint(ids []int64, orgid int64, advicetype int64, stoptype int64) (docto
 	return doctor, err
 }
 
+func GetHisPrint(ids []string, org_id int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+
+	err = XTReadDB().Where("id in (?) and user_org_id = ?", ids, org_id).Order("execution_time asc").Find(&advice).Error
+	return advice, err
+}
+
 func GetExportLogByType(org_id int64, log_type int64) (log []*models.ExportLog, err error) {
 	err = readDb.Model(&models.ExportLog{}).Where("user_org_id = ? AND status = 1 AND log_type = ?", org_id, log_type).
 		Preload("ExportErrLog", "status = 1").Order("export_time desc").Find(&log).Error

service/mobile_dialysis_service.go

@@ -634,6 +634,7 @@ func MobileGetReceiverTreatmentAccessRecord(orgID int64, patientID int64, record
 
 	key := strconv.FormatInt(orgID, 10) + ":" + strconv.FormatInt(patientID, 10) + ":" + strconv.FormatInt(recordDate, 10) + ":receive_treatment_asses"
 	receive_treatment_asses_str, _ := redis.Get(key).Result()
+
 	if len(receive_treatment_asses_str) == 0 { //没有到缓存数据，从数据库中获取数据，进行缓存到redis
 		err = readDb.Model(&models.ReceiveTreatmentAsses{}).Where("patient_id = ? and user_org_id = ? and status = 1 and record_date = ?", patientID, orgID, recordDate).First(&record).Error
 		if err != nil {

service/new_warehouse_service.go

@@ -4508,9 +4508,9 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 	if lastWarehouse.MaxUnit != lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
 		if lastWarehouse.StockMinNumber >= drup.MinNumber {
-			fmt.Println("hahhahahahahhaah")
 			var stockMax int64
 			var stockMin int64
+
 			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
 			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
 
@@ -4522,7 +4522,6 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 	}
 
 	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
-		fmt.Println("ooowowowowowowowowowo")
 		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
 		ChangeNewMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber, tx)
 
@@ -4547,8 +4546,8 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 	}
 
-	fmt.Println("stock_number", stock_number)
-	fmt.Println("deliver_number=============", deliver_number)
+	//fmt.Println("stock_number", stock_number)
+	//fmt.Println("deliver_number=============", deliver_number)
 	// 当库存数量大于或等于出库数量的话，则正常出库该批次
 	if stock_number >= deliver_number {
 
@@ -4558,8 +4557,8 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
 
-		fmt.Println("max_Number=====================", maxNumber)
-		fmt.Println("minNumber=====================", minNumber)
+		//fmt.Println("max_Number=====================", maxNumber)
+		//fmt.Println("minNumber=====================", minNumber)
 
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
@@ -4573,18 +4572,18 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
 
-			fmt.Println("金1")
+			//fmt.Println("金1")
 
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
 		}
 
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
-			fmt.Println("jin2")
+			//fmt.Println("jin2")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
-			fmt.Println("jin3")
+			//fmt.Println("jin3")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 
@@ -4597,8 +4596,8 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 
 		warehouse.Mtime = time.Now().Unix()
 
-		fmt.Println("hahhahahah", warehouse.StockMinNumber)
-		fmt.Println("howowowoowow", minNumber)
+		//fmt.Println("hahhahahah", warehouse.StockMinNumber)
+		//fmt.Println("howowowoowow", minNumber)
 		if warehouse.StockMinNumber < minNumber {
 
 			if warehouse.MaxUnit != warehouse.MinUnit {
@@ -4609,10 +4608,10 @@ func HisStoryBloodHisDrugDeliverInfo(orgID int64, prescribingNumber float64, war
 			if warehouse.MaxUnit != warehouse.MinUnit {
 				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
 			}
-			fmt.Println("minNumber------", minNumber)
-			fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
-			fmt.Println(" warehouse.MaxUnit", warehouse.MaxUnit)
-			fmt.Println(" warehouse.MinUnit", warehouse.MinUnit)
+			//fmt.Println("minNumber------", minNumber)
+			//fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
+			//fmt.Println(" warehouse.MaxUnit", warehouse.MaxUnit)
+			//fmt.Println(" warehouse.MinUnit", warehouse.MinUnit)
 
 			if warehouse.MaxUnit == warehouse.MinUnit {
 				//改动的地方

service/patient_service.go

@@ -589,7 +589,7 @@ func GetPatientListById(orgID int64, patientId int64) (patients models.PatientLi
 }
 
 func GetPatientCount(orgID int64) (total int64) {
-	readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1 and lapseto = 1", orgID).Count(&total)
+	readDb.Model(&models.Patients{}).Where("user_org_id=? and status=1 and lapseto = 1 and patient_type = 1", orgID).Count(&total)
 	return
 }
 func GetLapsetoPatientCount(orgID int64, lapseto int64) (total int64) {
@@ -5074,6 +5074,20 @@ func GetPatientMapList(user_org_id int64, keyword string) (patient []*models.SfP
 	return patient, err
 }
 
+func GetPatientMapListOne(user_org_id int64) (patient []*models.SfPatients, err error) {
+
+	err = XTReadDB().Where("user_org_id = ? and status=1 and lapseto =1", user_org_id).Find(&patient).Error
+
+	return patient, err
+}
+
+func GetAllAdminUserList(org_id int64, app_id int64) (admin []*models.SgjUserAdminRole, err error) {
+
+	err = UserReadDB().Where("org_id = ? and app_id = ? and status=1", org_id, app_id).Find(&admin).Error
+
+	return admin, err
+}
+
 func CreatePatientInCount(tx *gorm.DB, patientCount models.SfPatientInCount) error {
 
 	err := tx.Create(&patientCount).Error
@@ -5085,7 +5099,7 @@ func CreatePatientInCount(tx *gorm.DB, patientCount models.SfPatientInCount) err
 	return err
 }
 
-func ModifyPatientCount(tx *gorm.DB, hd_count int64, hdf_count int64, hdhp_count int64, hp_count int64, patient_id int64) (models.SfPatients, error) {
+func ModifyPatientCount(tx *gorm.DB, hd_count int64, hdf_count int64, hdhp_count int64, hp_count int64, other_count int64, patient_id int64) (models.SfPatients, error) {
 
 	patients := models.SfPatients{}
 
@@ -5097,6 +5111,8 @@ func ModifyPatientCount(tx *gorm.DB, hd_count int64, hdf_count int64, hdhp_count
 
 	err = tx.Model(&patients).Where("id=?", patient_id).UpdateColumn("hp_count", gorm.Expr("hp_count + ?", hp_count)).Error
 
+	err = tx.Model(&patients).Where("id=?", patient_id).UpdateColumn("other_count", gorm.Expr("other_count + ?", other_count)).Error
+
 	return patients, err
 }
 
@@ -5115,7 +5131,89 @@ func UpdatePatientInCount(tx *gorm.DB, hd_count int64, hdf_count int64, hdhp_cou
 	return patients, err
 }
 
-func GetPatientCountList(user_org_id int64, patient_id int64, page int64, limit int64) (patient []*models.SfPatientInCount, total int64, err error) {
+func ModiftyPatientCount(count int64, is_type int64, patient_id int64, tx *gorm.DB) (models.SfPatients, error) {
+
+	patients := models.SfPatients{}
+	if is_type == 1 {
+		err = tx.Model(&models.SfPatients{}).Where("id=?", patient_id).UpdateColumn("hd_count", gorm.Expr("hd_count + ?", count)).Error
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	if is_type == 2 {
+		err = tx.Model(&models.SfPatients{}).Where("id=?", patient_id).UpdateColumn("hdf_count", gorm.Expr("hdf_count + ?", count)).Error
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	if is_type == 3 {
+		err = tx.Model(&models.SfPatients{}).Where("id=?", patient_id).UpdateColumn("hdhp_count", gorm.Expr("hdhp_count + ?", count)).Error
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	if is_type == 4 {
+		err = tx.Model(&models.SfPatients{}).Where("id=?", patient_id).UpdateColumn("hp_count", gorm.Expr("hp_count + ?", count)).Error
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	if is_type == 5 {
+		err = tx.Model(&models.SfPatients{}).Where("id=?", patient_id).UpdateColumn("other_count", gorm.Expr("other_count + ?", count)).Error
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	return patients, err
+}
+
+func ReducePatientCount(count int64, is_type int64, patient_id int64, tx *gorm.DB) (models.SfPatients, error) {
+
+	patients := models.SfPatients{}
+	if is_type == 1 {
+		err = tx.Model(&models.SfPatients{}).Where("id=?", patient_id).UpdateColumn("hd_count", gorm.Expr("hd_count - ?", count)).Error
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	if is_type == 2 {
+		err = tx.Model(&models.SfPatients{}).Where("id=?", patient_id).UpdateColumn("hdf_count", gorm.Expr("hdf_count - ?", count)).Error
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	if is_type == 3 {
+		err = tx.Model(&models.SfPatients{}).Where("id=?", patient_id).UpdateColumn("hdhp_count", gorm.Expr("hdhp_count - ?", count)).Error
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	if is_type == 4 {
+		err = tx.Model(&models.SfPatients{}).Where("id=?", patient_id).UpdateColumn("hp_count", gorm.Expr("hp_count - ?", count)).Error
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	if is_type == 5 {
+		err = tx.Model(&models.SfPatients{}).Where("id=?", patient_id).UpdateColumn("other_count", gorm.Expr("other_count - ?", count)).Error
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	return patients, err
+}
+
+func GetPatientCountList(user_org_id int64, patient_id int64, page int64, limit int64, start_time int64, end_time int64) (patient []*models.SfPatientInCount, total int64, err error) {
 
 	db := XTReadDB().Model(&patient).Where("status=1")
 
@@ -5129,34 +5227,382 @@ func GetPatientCountList(user_org_id int64, patient_id int64, page int64, limit
 		db = db.Where("user_org_id = ?", user_org_id)
 	}
 
+	if start_time > 0 {
+		db = db.Where("record_date >=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("record_date<=?", end_time)
+	}
+
 	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&patient).Error
 
 	return patient, total, err
 }
 
-func CheckPatientCount(id int64) (models.SfPatientInCount, error) {
+func CheckPatientCount(id int64, tx *gorm.DB) (models.SfPatientInCount, error) {
 
 	patientInCount := models.SfPatientInCount{}
 
-	err = XTWriteDB().Model(&patientInCount).Where("id = ?", id).Updates(map[string]interface{}{"is_check": 1}).Error
-
+	err = tx.Model(&patientInCount).Where("id = ?", id).Updates(map[string]interface{}{"is_check": 1}).Error
+	if err != nil {
+		tx.Rollback()
+		return patientInCount, err
+	}
 	return patientInCount, err
 }
 
-func ReturnCheckPatientCount(id int64) (models.SfPatientInCount, error) {
+func ReturnCheckPatientCount(id int64, tx *gorm.DB) (models.SfPatientInCount, error) {
 
 	patientInCount := models.SfPatientInCount{}
 
-	err = XTWriteDB().Model(&patientInCount).Where("id = ?", id).Updates(map[string]interface{}{"is_check": 2}).Error
+	err = tx.Model(&patientInCount).Where("id = ?", id).Updates(map[string]interface{}{"is_check": 2}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return patientInCount, err
+	}
 
 	return patientInCount, err
 }
 
-func GetPatientCountById(id int64) (models.SfPatientInCount, error) {
+func UpdatePatientCountFlow(id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.SfPatientCountFlow{}).Where("warehouse_info_id = ?", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+}
+
+func GetPatientCountById(id int64, tx *gorm.DB) (models.SfPatientInCount, error) {
 
 	patientInCount := models.SfPatientInCount{}
 
-	err := XTReadDB().Where("id = ?", id).Find(&patientInCount).Error
+	err := tx.Where("id = ?", id).Find(&patientInCount).Error
+	if err != nil {
+		tx.Rollback()
+		return patientInCount, err
+	}
 
 	return patientInCount, err
 }
+
+func DeletePatientCount(id int64) (models.SfPatientInCount, error) {
+
+	patientCount := models.SfPatientInCount{}
+
+	err := XTWriteDB().Model(&patientCount).Where("id = ?", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return patientCount, err
+}
+
+func CreateSfPatientOutCount(outCount models.SfPatientOutCount) error {
+
+	err := XTWriteDB().Create(&outCount).Error
+
+	return err
+}
+
+func GetPatientOutCountList(patient_id int64, user_org_id int64, limit int64, page int64, start_time int64, end_time int64) (outcount []*models.SfPatientOutCount, total int64, err error) {
+
+	db := XTReadDB().Model(&outcount).Where("status=1")
+
+	offset := (page - 1) * limit
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("start_time>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("end_time<=?", end_time)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("record_date desc").Find(&outcount).Error
+
+	return outcount, total, err
+
+}
+
+func GetPatientScheduleByPatient(patient_id int64, record_date int64, user_org_id int64) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+	err = XTReadDB().Where("patient_id = ? and schedule_date = ? and user_org_id = ? and status=1", patient_id, record_date, user_org_id).Last(&schedule).Error
+
+	return schedule, err
+}
+
+func GetDialysisSolutonByScheduleModeId(mode_id int64, patient_id int64, user_org_id int64) (models.DialysisSolution, error) {
+
+	solution := models.DialysisSolution{}
+
+	err = XTReadDB().Where("mode_id = ? and patient_id = ? and user_org_id = ? and solution_status =1", mode_id, patient_id, user_org_id).Find(&solution).Error
+
+	return solution, err
+}
+
+func DeletePatientOutCount(id int64) error {
+
+	outCount := models.SfPatientOutCount{}
+
+	err := XTWriteDB().Model(&outCount).Where("id = ? and status=1", id).Updates(map[string]interface{}{"status": 0}).Error
+
+	return err
+}
+
+func GetPatientOutCountById(id int64, tx *gorm.DB) (models.SfPatientOutCount, error) {
+
+	outCount := models.SfPatientOutCount{}
+	err = tx.Where("id=? and status=1", id).Find(&outCount).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return outCount, err
+		}
+	}
+	return outCount, err
+}
+
+func CreatePatientCountFlow(flow models.SfPatientCountFlow, tx *gorm.DB) error {
+
+	err := tx.Create(&flow).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
+func GetSfPatientById(tx *gorm.DB, patient_id int64) (models.SfPatients, error) {
+
+	patients := models.SfPatients{}
+	err := tx.Where("id =? and status=1", patient_id).Find(&patients).Error
+
+	if err != gorm.ErrRecordNotFound {
+		if err != nil {
+			tx.Rollback()
+			return patients, err
+		}
+	}
+	return patients, err
+}
+
+func GetSfPatientByIdOne(patient_id int64) (models.SfPatients, error) {
+
+	patients := models.SfPatients{}
+	err := XTReadDB().Where("id =? and status=1", patient_id).Find(&patients).Error
+
+	return patients, err
+}
+
+func CheckPatientOutCount(id int64, tx *gorm.DB) error {
+
+	patients := models.SfPatientOutCount{}
+
+	err := tx.Model(&patients).Where("id=? and status=1", id).Updates(map[string]interface{}{"is_check": 1, "mtime": time.Now().Unix()}).Error
+
+	return err
+}
+
+func ReturnPatientOutCount(id int64, tx *gorm.DB) error {
+
+	err = tx.Model(&models.SfPatientOutCount{}).Where("id=?", id).Updates(map[string]interface{}{"is_check": 2}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+
+	return err
+}
+
+func DeletePatientCountFlow(id int64, tx *gorm.DB) error {
+
+	err := tx.Model(&models.SfPatientCountFlow{}).Where("warehouse_out_id = ?", id).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
+
+	if err != nil {
+		tx.Rollback()
+		return err
+	}
+	return err
+
+}
+
+func GetPatientCountMapList(patient_id int64, limit int64, page int64, user_org_id int64) (patient []*models.SfPatients, total int64, err error) {
+
+	db := XTReadDB().Model(&patient).Where("status=1")
+
+	offset := (page - 1) * limit
+
+	if (patient_id) > 0 {
+		db = db.Where("id = ?", patient_id)
+	}
+	if (user_org_id) > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+
+	err = db.Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&patient).Error
+
+	return patient, total, err
+}
+
+func GetPatientCountFlow(patient_id int64, user_org_id int64, is_type int64, mode_id int64, start_time int64, end_time int64) (flow []*models.SfPatientCountFlow, total int64, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id=?", patient_id)
+	}
+	if user_org_id > 0 {
+		db = db.Where("user_org_id = ?", user_org_id)
+	}
+	if is_type > 0 {
+		db = db.Where("is_type = ?", is_type)
+	}
+	if mode_id > 0 {
+		db = db.Where("mode_id = ?", mode_id)
+	}
+
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, total, err
+}
+
+func GetDialysisOrderSetting(user_org_id int64) (models.XtDialysisOrderSetting, error) {
+
+	orderSetting := models.XtDialysisOrderSetting{}
+	err = XTReadDB().Model(&orderSetting).Where("user_org_id = ? and status=1", user_org_id).Find(&orderSetting).Error
+
+	return orderSetting, err
+}
+
+func GetDialysisOrderSchedule(patient_id int64, schedule_date int64, user_org_id int64, tx *gorm.DB) (models.XtSchedule, error) {
+
+	schedule := models.XtSchedule{}
+
+	err = tx.Where("patient_id=? and schedule_date = ? and user_org_id=? and status=1", patient_id, schedule_date, user_org_id).Find(&schedule).Error
+
+	if err != nil {
+		tx.Rollback()
+		return schedule, err
+	}
+
+	return schedule, err
+}
+
+func CreateDialysisOrder(setting models.XtDialysisOrderSetting) error {
+
+	err := XTWriteDB().Create(&setting).Error
+
+	return err
+}
+
+func GetPatientCountFlowList(patient_id int64, start_time int64, end_time int64, limit int64, page int64, orgId int64, is_type int64) (flow []*models.SfPatientCountFlow, total int64, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1")
+
+	offset := (page - 1) * limit
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+
+	if is_type > 0 {
+		db = db.Where("is_type = ?", is_type)
+	}
+
+	err = db.Group("patient_id,mode_id,is_type").Count(&total).Offset(offset).Limit(limit).Order("id desc").Find(&flow).Error
+
+	return flow, total, err
+}
+
+func GetPatientCountListFlowOne(patient_id int64, start_time int64, end_time int64, is_type int64, orgId int64) (flow []*models.SfPatientCountFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id = ?", patient_id)
+	}
+	if start_time > 0 {
+		db = db.Where("ctime>=?", start_time)
+	}
+
+	if end_time > 0 {
+		db = db.Where("ctime<=?", end_time)
+	}
+
+	if orgId > 0 {
+		db = db.Where("user_org_id = ?", orgId)
+	}
+
+	if is_type > 0 {
+		db = db.Where("is_type = ?", is_type)
+	}
+
+	err = db.Order("id desc").Find(&flow).Error
+
+	return flow, err
+
+}
+
+func GetPatientCountFlowByIdList(patient_id int64, orgId int64, mode_id int64, is_type int64, startTime int64, endTime int64) (flow []*models.SfPatientCountFlow, err error) {
+
+	db := XTReadDB().Model(&flow).Where("status=1")
+
+	if patient_id > 0 {
+		db = db.Where("patient_id=?", patient_id)
+	}
+	if orgId > 0 {
+		db = db.Where("user_org_id =?", orgId)
+	}
+
+	if mode_id > 0 {
+		db = db.Where("mode_id = ?", mode_id)
+	}
+
+	if is_type > 0 {
+		db = db.Where("is_type =?", is_type)
+	}
+
+	if startTime > 0 {
+		db = db.Where("ctime>=?", startTime)
+	}
+	if endTime > 0 {
+		db = db.Where("ctime<=?", endTime)
+	}
+	if mode_id > 0 {
+		db = db.Where("mode_id = ?", mode_id)
+	}
+	err = db.Find(&flow).Error
+
+	return flow, err
+}

service/patientmanage_service.go

@@ -1971,22 +1971,22 @@ type InspectionCount struct {
 
 func GetNormalInspectionTotalByID(startime int64, endtime int64, orgid int64, item_name string, max_value float64, min_value float64) (total int64, err error) {
 	var count []*models.Inspection
-	err2 := XTReadDB().Table("xt_inspection as xti ").Select("count(*) as count").Joins("join (SELECT max(inspect_date) as ind, patient_id as pid  FROM xt_inspection as x Join xt_patients pp on pp.id = x.patient_id and pp.lapseto = 1  WHERE (x.status = 1) AND (x.org_id = ?  and x.item_name = ?  and x.inspect_date >= ? and x.inspect_date <= ?) group by patient_id) as ta on ta.ind = xti.`inspect_date` and xti.patient_id = ta.pid  WHERE (xti.status = 1) AND (xti.org_id = ?  and xti.item_name = ?  and xti.inspect_date >= ? and xti.inspect_date<= ? and xti.`inspect_value` <= ? and xti.inspect_value >= ? ) Group by xti.patient_id", orgid, item_name, startime, endtime, orgid, item_name, startime, endtime, max_value, min_value).Scan(&count).Error
+	err2 := XTReadDB().Table("xt_inspection as xti ").Select("count(*) as count").Joins("join (SELECT max(inspect_date) as ind, patient_id as pid  FROM xt_inspection as x Join xt_patients pp on pp.id = x.patient_id and pp.lapseto = 1 and pp.patient_type =1  WHERE (x.status = 1) AND (x.org_id = ?  and x.item_name = ?  and x.inspect_date >= ? and x.inspect_date <= ?) group by patient_id) as ta on ta.ind = xti.`inspect_date` and xti.patient_id = ta.pid  WHERE (xti.status = 1) AND (xti.org_id = ?  and xti.item_name = ?  and xti.inspect_date >= ? and xti.inspect_date<= ? and xti.`inspect_value` <= ? and xti.inspect_value >= ? ) Group by xti.patient_id", orgid, item_name, startime, endtime, orgid, item_name, startime, endtime, max_value, min_value).Scan(&count).Error
 
 	return int64(len(count)), err2
 }
 func GetUnusualInspectionTotalByID(startime int64, endtime int64, orgid int64, item_name string, max_value float64, min_value float64) (total int64, err error) {
 	var count []*models.Inspection
-	err2 := XTReadDB().Table("xt_inspection as xti ").Select("count(*) as count").Joins("join (SELECT max(inspect_date) as ind, patient_id as pid  FROM xt_inspection as x JOIN xt_patients pp on pp.id = x.patient_id and pp.status = 1 and pp.lapseto = 1  WHERE (x.status = 1) AND (x.org_id = ? and x.item_name = ?  and x.inspect_date >= ? and x.inspect_date <= ?) group by patient_id) as ta on ta.ind = xti.`inspect_date` and xti.patient_id = ta.pid  WHERE   (xti.status = 1 AND xti.org_id = ? and xti.item_name = ?  and xti.inspect_date >= ? and xti.inspect_date <= ? and xti.inspect_value > ?) OR (xti.status = 1 AND xti.org_id = ?  and xti.item_name = ?  and xti.inspect_date >= ? and xti.inspect_date <= ? and xti.inspect_value < ?) Group by xti.patient_id", orgid, item_name, startime, endtime, orgid, item_name, startime, endtime, max_value, orgid, item_name, startime, endtime, min_value).Scan(&count).Error
+	err2 := XTReadDB().Table("xt_inspection as xti ").Select("count(*) as count").Joins("join (SELECT max(inspect_date) as ind, patient_id as pid  FROM xt_inspection as x JOIN xt_patients pp on pp.id = x.patient_id and pp.status = 1 and pp.lapseto = 1 and pp.patient_type =1   WHERE (x.status = 1) AND (x.org_id = ? and x.item_name = ?  and x.inspect_date >= ? and x.inspect_date <= ?) group by patient_id) as ta on ta.ind = xti.`inspect_date` and xti.patient_id = ta.pid  WHERE   (xti.status = 1 AND xti.org_id = ? and xti.item_name = ?  and xti.inspect_date >= ? and xti.inspect_date <= ? and xti.inspect_value > ?) OR (xti.status = 1 AND xti.org_id = ?  and xti.item_name = ?  and xti.inspect_date >= ? and xti.inspect_date <= ? and xti.inspect_value < ?) Group by xti.patient_id", orgid, item_name, startime, endtime, orgid, item_name, startime, endtime, max_value, orgid, item_name, startime, endtime, min_value).Scan(&count).Error
 	return int64(len(count)), err2
 }
 func GetPatientNotInspectionTotal(startime int64, endtime int64, orgid int64, item_name string) (total int64, err error) {
-	err = XTReadDB().Model(models.XtPatients{}).Joins("LEFT JOIN xt_inspection pd ON xt_patients.id = pd.patient_id and pd.org_id = ? and pd.item_name = ? and pd.inspect_date >= ? and pd.inspect_date<=? ", orgid, item_name, startime, endtime).Where("xt_patients.user_org_id = ? and xt_patients.status = 1 and pd.patient_id IS NULL and xt_patients.lapseto = 1", orgid).Count(&total).Error
+	err = XTReadDB().Model(models.XtPatients{}).Joins("LEFT JOIN xt_inspection pd ON xt_patients.id = pd.patient_id and pd.org_id = ? and pd.item_name = ? and pd.inspect_date >= ? and pd.inspect_date<=? ", orgid, item_name, startime, endtime).Where("xt_patients.user_org_id = ? and xt_patients.status = 1 and pd.patient_id IS NULL and xt_patients.lapseto = 1 and xt_patients.patient_type = 1", orgid).Count(&total).Error
 	return total, err
 }
 
 func GetPatientInspectionByID(startime int64, endtime int64, orgid int64, patient_id int64, item_name string) (inspections []*models.Inspection, err error) {
-	db := XTReadDB().Table("xt_inspection as x").Select("patient_id,inspect_date,inspect_value").Joins("join xt_patients p On p.id = x.patient_id and p.status = 1 and p.lapseto = 1").Where("x.status = 1")
+	db := XTReadDB().Table("xt_inspection as x").Select("patient_id,inspect_date,inspect_value").Joins("join xt_patients p On p.id = x.patient_id and p.status = 1 and p.lapseto = 1 and p.patient_type =1").Where("x.status = 1")
 	if startime > 0 {
 		db = db.Where("x.inspect_date >= ?", startime)
 	}
@@ -2009,7 +2009,7 @@ func GetPatientInspectionByID(startime int64, endtime int64, orgid int64, patien
 }
 
 func GetPatientKTVORURRInspectionByID(startime int64, endtime int64, orgid int64, projectid int64, item_id int64, patient_id int64) (inspections []*models.Inspection, err error) {
-	db := XTReadDB().Table("xt_inspection as x").Select("patient_id,inspect_date,inspect_value").Joins("join xt_patients p On p.id = x.patient_id and p.status = 1 and p.lapseto = 1").Where("x.status = 1")
+	db := XTReadDB().Table("xt_inspection as x").Select("patient_id,inspect_date,inspect_value").Joins("join xt_patients p On p.id = x.patient_id and p.status = 1 and p.lapseto = 1 and p.patient_type =1").Where("x.status = 1")
 	if startime > 0 {
 		db = db.Where("x.inspect_date >= ?", startime)
 	}

service/pharmacy_service.go

@@ -2561,9 +2561,17 @@ func DispensingMedicineTwo(orgid, patient_id, advice_date, drug_id, creater int6
 	return
 }
 
-func GetDrugTocalCountByDrugId(drug_id int64, advice_date int64, user_org_id int64) (advice []*models.HisDoctorAdviceInfo, err error) {
+func GetDrugTocalCountByDrugId(drug_id int64, advice_date int64, user_org_id int64) (advice []*models.NBHisDoctorAdviceInfo, err error) {
 
 	err = XTReadDB().Where("drug_id = ? and advice_date>=? and user_org_id = ? and status=1 and drug_code!=''", drug_id, advice_date, user_org_id).Find(&advice).Error
 
 	return advice, err
 }
+
+func GetNewBaseDrugById(id int64) (models.NBXtBaseDrug, error) {
+
+	drug := models.NBXtBaseDrug{}
+	err := XTReadDB().Where("id = ?", id).Find(&drug).Error
+
+	return drug, err
+}

service/self_drug_service.go

@@ -1271,7 +1271,7 @@ func GetInventoryModeList(orgid int64) (info []*models.PatientDrugWarehouseInfo,
 		if orgid > 0 {
 			db = db.Where("x.org_id = ?", orgid)
 		}
-		err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer,t.sum_count,x.max_unit as max_unit_one,x.min_unit as min_unit_one").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.batch_number").Scan(&info).Error
+		err = db.Select("x.drug_id,x.number,x.product_date,x.expiry_date,x.stock_max_number,x.stock_min_number,x.batch_number,t.drug_name,t.max_unit,t.min_unit,t.min_number,t.dose,t.dose_unit,x.manufacturer,x.dealer,t.sum_count,x.max_unit as max_unit_one,x.min_unit as min_unit_one").Joins("left join xt_base_drug as t on t.id = x.drug_id").Group("x.drug_id,x.id").Scan(&info).Error
 		return info, err
 	} else {
 		db := XTReadDB().Table("xt_drug_warehouse_info as x").Where("x.status = 1 and (x.warehousing_count>0)")

service/sign_service.go

@@ -2488,7 +2488,7 @@ func BloodNewHisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoct
 
 func CheckSchedule() (schedule []*models.XtSchedule, err error) {
 
-	err = readDb3.Where("user_org_id = 10445 and schedule_date<1741536000").Find(&schedule).Error
+	err = readDb3.Where("user_org_id = 9535 and schedule_date<1741536000").Find(&schedule).Error
 
 	return schedule, err
 }

service/warhouse_service.go

@@ -11049,10 +11049,15 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 		if lastWarehouse.StockMinNumber >= drup.MinNumber {
 			var stockMax int64
 			var stockMin int64
+
+			var stockMac_One int64
+
 			stockMax = lastWarehouse.StockMinNumber / drup.MinNumber
 			stockMin = lastWarehouse.StockMinNumber % drup.MinNumber
 
-			ChangeNewMaxNumberOne(lastWarehouse.ID, stockMax, tx)
+			stockMac_One = lastWarehouse.StockMaxNumber + stockMax
+
+			ChangeNewMaxNumberOne(lastWarehouse.ID, stockMac_One, tx)
 			UpdateNewMinNumber(lastWarehouse.ID, stockMin, tx)
 
 		}
@@ -11061,6 +11066,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 	if lastWarehouse.MaxUnit == lastWarehouse.MinUnit && drup.MaxUnit != drup.MinUnit && lastWarehouse.MinUnit != "" {
 
 		lastWarehouse.StockMaxNumber = lastWarehouse.StockMaxNumber + lastWarehouse.StockMinNumber
+
 		ChangeNewMaxNumberOne(lastWarehouse.ID, lastWarehouse.StockMaxNumber, tx)
 
 	}
@@ -11083,6 +11089,9 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 		stock_number = warehouse.StockMaxNumber*drup.MinNumber + warehouse.StockMinNumber
 
 	}
+
+	fmt.Println("stock_number--------------", stock_number)
+	fmt.Println("deliver_number", deliver_number)
 	if stock_number >= deliver_number {
 
 		var maxNumber int64 = 0
@@ -11091,6 +11100,10 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 		maxNumber = deliver_number / drup.MinNumber
 		minNumber = deliver_number % drup.MinNumber
 
+		fmt.Println("maxNumber==============", maxNumber)
+
+		fmt.Println("maxNumber==============", minNumber)
+
 		if warehouse.StockMaxNumber == 0 && drup.MaxUnit == drup.MinUnit {
 			minNumber = maxNumber
 		}
@@ -11101,17 +11114,20 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 			}
 		}
 
+		fmt.Println("warehouse.StockMaxNumber", warehouse.StockMaxNumber)
+		fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
+
 		if drup.MinUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
-			//fmt.Println("金1")
+			fmt.Println("金1")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber*drup.MinNumber
 		}
 
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit != drup.MinUnit {
-			//fmt.Println("金2")
+			fmt.Println("金2")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 		if drup.MaxUnit == warehouse.MaxUnit && drup.MaxUnit == drup.MinUnit {
-			//fmt.Println("金3")
+			fmt.Println("金3")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - maxNumber
 		}
 
@@ -11124,8 +11140,12 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 
 		warehouse.Mtime = time.Now().Unix()
 
+		fmt.Println("warehouse.StockMinNumber", warehouse.StockMinNumber)
+
+		fmt.Println("minNumber222222222222222", minNumber)
+
 		if warehouse.StockMinNumber < minNumber {
-			//fmt.Println("金4")
+			fmt.Println("金4")
 			warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			if warehouse.MaxUnit != warehouse.MinUnit {
 				warehouse.StockMinNumber = warehouse.StockMinNumber + drup.MinNumber - minNumber
@@ -11134,7 +11154,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 				warehouse.StockMaxNumber = warehouse.StockMaxNumber - 1
 			}
 		} else {
-			//fmt.Println("金5")
+			fmt.Println("金5", minNumber)
 			if minNumber > 0 {
 				if (warehouse.StockMinNumber - minNumber) >= 0 {
 					warehouse.StockMinNumber = warehouse.StockMinNumber - minNumber
@@ -11143,7 +11163,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 			}
 
 			if minNumber == 0 && maxNumber != 1 && warehouse.StockMaxNumber <= 0 {
-				//fmt.Println("6")
+				fmt.Println("金6", warehouse.StockMinNumber)
 				if warehouse.StockMinNumber > 0 {
 					if warehouse.StockMinNumber-deliver_number >= 0 {
 						warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
@@ -11157,7 +11177,7 @@ func AutoNewDrugDeliverInfoFourtyOne(orgID int64, prescribingNumber int64, wareh
 
 		if maxNumber == 1 && minNumber == 0 && drup.MaxUnit != drup.MinUnit && warehouse.MaxUnit != warehouse.MinUnit {
 			if (warehouse.StockMinNumber - deliver_number) >= 0 {
-				//fmt.Println("金7")
+				fmt.Println("金7")
 				warehouse.StockMinNumber = warehouse.StockMinNumber - deliver_number
 			}