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

controllers/base_api_controller.go

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

controllers/mobile_api_controllers/patient_api_controller.go

@@ -3838,12 +3838,13 @@ func (c *PatientApiController) CreateGroupAdvice() {
 				}
 			}
 
+			fmt.Println("admin==================", adminUserInfo.Org.Id)
 			//长沙南雅
 			if adminUserInfo.Org.Id == 3877 || adminUserInfo.Org.Id == 10340 || adminUserInfo.Org.Id == 9671 {
 
 				//查询该患者今日有没有双人核对
 				check, _ := service.MobileGetDoubleCheckSix(adminUserInfo.Org.Id, patientInfo.ID, RecordDate)
-
+				fmt.Println("check----------------", check)
 				if check.ID > 0 {
 					advice.Checker = check.Modifier
 					advice.CheckState = 1

controllers/patient_api_controller.go

@@ -1418,9 +1418,22 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		}
 
 		remark, _ := adviceNameM["remark"].(string)
-		fmt.Println("哦哦撒搜哦搜搜哦remark-----------------------------------", remark)
+
 		advice.Remark = remark
 
+		if adminUserInfo.CurrentOrgId == 3877 || adminUserInfo.CurrentOrgId == 10340 || adminUserInfo.CurrentOrgId == 9671 {
+			if advice.PrescribingNumber == 0 {
+				advice.PrescribingNumber = 1
+			}
+			//查询该患者今日有没有双人核对
+			check, _ := service.MobileGetDoubleCheckSix(adminUserInfo.CurrentOrgId, patientInfo.ID, advice.AdviceDate)
+			fmt.Println("chek", check)
+			if check.ID > 0 {
+				advice.Checker = check.Modifier
+				advice.CheckState = 1
+				advice.CheckTime = time.Now().Unix()
+			}
+		}
 		if adviceType == 1 {
 
 			if adviceNameM["frequency_type"] != nil || reflect.TypeOf(adviceNameM["frequency_type"]).String() == "float64" {
@@ -1448,6 +1461,7 @@ func (c *PatientApiController) CreateGroupAdvice() {
 				}
 				advice.PushStartTime = startTime
 			}
+
 		}
 
 		if adviceNameM["children"] != nil && reflect.TypeOf(adviceNameM["children"]).String() == "string" {

service/his_service.go

@@ -981,13 +981,19 @@ func GetHisOrderList(user_org_id int64, page int64, limit int64, start_time_time
 		db = db.Joins("join xt_patients as patient on patient.id = his_order.patient_id  AND patient.name like ? AND patient.user_org_id = ?", keywords, user_org_id)
 
 	}
-
-	if sch_type > 0 {
-		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id AND sch.schedule_type = ? AND sch.schedule_date >= ? AND sch.schedule_date <= ?", sch_type, start_time_timestamp, end_time_timestamp)
+	if sch_type > 0 && zone_type > 0 {
+		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id AND sch.schedule_type = ? AND sch.schedule_date >= ? AND sch.schedule_date <= ? AND sch.partition_id = ? AND sch.status  = 1", sch_type, start_time_timestamp, end_time_timestamp, zone_type)
 	}
-	if zone_type > 0 {
-		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id AND sch.partition_id = ?", zone_type)
+	if sch_type > 0 && zone_type == 0 {
+		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id AND sch.schedule_type = ? AND sch.schedule_date >= ? AND sch.schedule_date <= ? AND sch.status = 1", sch_type, start_time_timestamp, end_time_timestamp)
 	}
+	if sch_type == 0 && zone_type > 0 {
+		db = db.Joins("join xt_schedule sch on sch.schedule_date = his_order.settle_accounts_date AND sch.patient_id = his_order.patient_id  AND sch.schedule_date >= ? AND sch.schedule_date <= ? AND sch.partition_id = ? AND sch.status = 1", start_time_timestamp, end_time_timestamp, zone_type)
+	}
+
+	//if zone_type > 0 {
+	//	db = db.Joins("join xt_schedule sch_two on sch_two.schedule_date = his_order.settle_accounts_date AND sch_two.patient_id = his_order.patient_id AND sch_two.partition_id = ?", zone_type)
+	//}
 
 	if sort_type == 1 {
 		if start_time_timestamp != 0 {