hahah

.idea/.gitignore

@@ -1,4 +0,0 @@
-# Default ignored files
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources.local.xml

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

.idea/dataSources.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="@rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com" uuid="a5e97996-c706-42df-9eba-66746647237e">
-      <driver-ref>mysql.8</driver-ref>
-      <synchronize>true</synchronize>
-      <remarks>lijc de database</remarks>
-      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com:3306</jdbc-url>
-    </data-source>
-  </component>
-</project>

.idea/encodings.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>

.idea/misc.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="SvnBranchConfigurationManager">
-    <option name="myConfigurationMap">
-      <map>
-        <entry key="$PROJECT_DIR$/../CDM">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="trunkUrl" value="svn://112.74.16.180/Product/SGJ/SGJ1.0/Project/SGJ1.0/Application/MBGL" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-        <entry key="$PROJECT_DIR$/../SYB_Admin">
-          <value>
-            <SvnBranchConfiguration>
-              <option name="trunkUrl" value="svn://112.74.16.180/Product/SYB/SYB1.0/Application/SYB_Admin" />
-            </SvnBranchConfiguration>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-</project>

.idea/vcs.xml

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GitSharedSettings">
-    <option name="FORCE_PUSH_PROHIBITED_PATTERNS">
-      <list />
-    </option>
-  </component>
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>

conf/app.conf

@@ -65,6 +65,13 @@ readmysqluser2 = syh
 readmysqlpass2 = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readmysqlname2 = sgj_xt
 
+readmysqlhost3 = rm-wz9r3iil42mn24675oo.mysql.rds.aliyuncs.com
+readmysqlport3 = 3306
+readmysqluser3 = syh
+readmysqlpass3 = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
+readmysqlname3 = sgj_xt
+
+
 writemysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writemysqlport = 3306
 writemysqluser = syh
@@ -103,6 +110,8 @@ readsgjpatientmysqluser = syh
 readsgjpatientmysqlpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readsgjpatientmysqlname = sgj_patient
 
+
+
 writesgjpatientmysqlhost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writesgjpatientmysqlport = 3306
 writesgjpatientmysqluser = syh
@@ -116,12 +125,16 @@ readpatientuser = syh
 readpatientpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 readpatientname = sgj_cdm
 
+
+
 writepatienthost = kuyicloud2024lt.mysql.rds.aliyuncs.com
 writepatientport = 3306
 writepatientuser = syh
 writepatientpass = Zc8xxwN4jkZswprx8VKHRSd2rBMRWgC4
 writepatientname = sgj_cdm
 
+
+
 redishost = kuyicloud.redis.rds.aliyuncs.com
 redisport = 6379
 redispasswrod = 1Q2W3e4r!@#$

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

controllers/dialysis_api_controller.go

@@ -2500,6 +2500,15 @@ func (c *DialysisApiController) PostAssessmentAfterDislysis() {
 
 			}
 		}
+
+		if adminUserInfo.CurrentOrgId == 10744 {
+			evaluation, _ := service.GetAssessmentBeforThrity(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+			if evaluation.WeightBefore > 0 {
+				assessment.WeightLoss = evaluation.WeightBefore - assessment.WeightAfter
+			}
+
+		}
+
 		err = service.UpdateAssessmentAfterDislysisRecord(&assessment)
 		//记录日志
 		byterequest, _ := json.Marshal(assessment)
@@ -3529,14 +3538,16 @@ func (c *DialysisApiController) PostAssessmentBeforeDislysis() {
 				}
 			}
 
-			if assessmentBeforeDislysis.ID > 0 {
-				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
-				if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
-					dewater_amount = assessmentBeforeDislysis.WeightBefore - assessmentBeforeDislysis.DryWeight - assessmentBeforeDislysis.AdditionalWeight
-					if adminUserInfo.CurrentOrgId == 10751 {
-						dewater_amount = dewater_amount * 1000
+			if adminUserInfo.CurrentOrgId != 10751 {
+				if assessmentBeforeDislysis.ID > 0 {
+					dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.CurrentOrgId, patient, recordDate.Unix())
+					if dialysisPrescribeOne.ID > 0 && assessmentBeforeDislysis.ID > 0 {
+						dewater_amount = assessmentBeforeDislysis.WeightBefore - assessmentBeforeDislysis.DryWeight - assessmentBeforeDislysis.AdditionalWeight
+						//if adminUserInfo.CurrentOrgId == 10751 {
+						//	dewater_amount = dewater_amount * 1000
+						//}
+						service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
 					}
-					service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
 				}
 			}
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -882,6 +882,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			evaluation.UserOrgId = adminUserInfo.Org.Id
 			// 获取上一次透前评估信息，部分数据是需要从上一次透前评估继承
 			lastPredialysisEvaluation, _ := service.MobileGetLastTimePredialysisEvaluationOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+
 			// 获取上一次透后评估，插入本次透前评估的上次透后体重（weight_after_last_transparency）字段
 			assessmentAfterDislysis, getAADErr := service.MobileGetLastTimeAssessmentAfterDislysisOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
 			if getAADErr != nil {
@@ -968,6 +969,9 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				if adminUserInfo.Org.Id == 10702 {
 					evaluation.PulseFrequency = 0
 				}
+				if adminUserInfo.Org.Id == 10121 || adminUserInfo.Org.Id == 10234 {
+					evaluation.Height = lastPredialysisEvaluation.Height
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()
@@ -1073,6 +1077,7 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 		}
 
 		afterevaluation.WeightAfter = weight_after
+
 		afterevaluation.WeightLoss = weight_loss
 
 		if adminUserInfo.Org.Id == 10138 {
@@ -1148,6 +1153,14 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 			afterevaluation.Temperature = 36.5
 		}
 
+		if adminUserInfo.Org.Id == 10744 {
+			evaluation, _ := service.GetAssessmentBeforThrity(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+			if evaluation.WeightBefore > 0 {
+				afterevaluation.WeightLoss = evaluation.WeightBefore - weight_after
+			}
+
+		}
+
 		err := service.UpdateAssessmentAfterDislysisRecord(&afterevaluation)
 
 		//记录日志

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1538,8 +1538,10 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 					infor, _ := service.GetDialysisInformationByRecordDate(advices.PatientId, advices.AdviceDate, adminUserInfo.Org.Id, 4)
 					//申请状态不允许的情况 拒绝修改
 					if infor.ApplicationStatus != 1 {
+
 						c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeInformationExist)
 						return
+
 					}
 
 				}
@@ -1649,7 +1651,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 		storeHouseConfig, _ := service.GetAllStoreHouseConfig(adminUserInfo.Org.Id)
 
-		if drugStockConfig.IsOpen == 1 {
+		if drugStockConfig.IsOpen == 1 && adminUserInfo.Org.Id != 10644 && adminUserInfo.Org.Id != 10721 {
 			if groupno > 0 {
 				advices, _ := service.FindAllDoctorAdviceByGoroupNoTwety(adminUserInfo.Org.Id, groupno)
 
@@ -2182,6 +2184,8 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 			// 查询信息规挡的设置天数
 
 			infor, _ := service.GetDialysisInformationSetting(item.UserOrgId)
+
+			fmt.Println("infor==================", infor.ID)
 			if infor.ID > 0 {
 
 				var cha_time int64
@@ -2288,6 +2292,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 								PrescribingNumberUnit: item.PrescribingNumberUnit,
 							}
 							service.CreateDrugError(drugError)
+							tx.Rollback()
 						}
 					}
 					advice, _ := service.FindHisDoctorAdviceByIdTwo(adminInfo.Org.Id, item.ID, tx)
@@ -2451,6 +2456,9 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 						}
 					}
 
+					fmt.Println("prescribing_number_total", prescribing_number_total)
+					fmt.Println("total------------", total)
+
 					if prescribing_number_total <= total {
 
 						pharmacyConfig, _ := service.FindPharmacyConfig(advice.UserOrgId)
@@ -4607,14 +4615,16 @@ func (c *PatientApiController) EditAssessmentBeforeDislysis() {
 			}
 		}
 
-		if evaluation.ID > 0 {
-			dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
-			if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
-				dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
-				if adminUserInfo.Org.Id == 10751 {
-					dewater_amount = dewater_amount * 1000
+		if adminUserInfo.Org.Id != 10751 {
+			if evaluation.ID > 0 {
+				dialysisPrescribeOne, _ := service.MobileGetDialysisPrescribeOne(adminUserInfo.Org.Id, id, theAssessmentDateTime)
+				if dialysisPrescribeOne.ID > 0 && evaluation.ID > 0 {
+					dewater_amount = evaluation.WeightBefore - evaluation.DryWeight - evaluation.AdditionalWeight
+					//if adminUserInfo.Org.Id == 10751 {
+					//	dewater_amount = dewater_amount * 1000
+					//}
+					service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
 				}
-				service.UpdateMobileGetDialysisPrescribeOne(dialysisPrescribeOne.ID, dewater_amount)
 			}
 		}
 
@@ -6337,6 +6347,7 @@ func (c *PatientApiController) GetPrintDialysisOrder() {
 func (c *PatientApiController) CreateGroupAdvice() {
 	is_child, _ := c.GetInt64("is_child", 0)
 
+	fmt.Println("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhh", is_child)
 	if is_child == 1 {
 		patient, _ := c.GetInt64("id", 0)
 		if patient <= 0 {
@@ -7020,7 +7031,7 @@ func (c *PatientApiController) DelDoctorAdvice() {
 				}
 			}
 
-			err = service.DeleteDoctorAdviceByGroupNo(&advice)
+			err = service.DeleteDoctorAdviceByGroupNoOne(&advice)
 			//记录日志
 			byterequest, _ := json.Marshal(advice)
 			adviceLog := models.XtDoctorAdviceLog{

controllers/patient_api_controller.go

@@ -225,6 +225,16 @@ func PatientApiRegistRouters() {
 
 	beego.Router("/api/patient/getinspectionbyprojectid", &PatientApiController{}, "Get:GetInspectionByProjectId")
 
+	beego.Router("/api/patient/getpatientmaplist", &PatientApiController{}, "Get:GetPatientMapList")
+
+	beego.Router("/api/patient/savepatientcount", &PatientApiController{}, "Get:SavePatientCount")
+
+	beego.Router("/api/patient/getpatientcount", &PatientApiController{}, "Get:GetPatientCountList")
+
+	beego.Router("/api/patient/checkpatientcount", &PatientApiController{}, "Get:CheckPatientCount")
+
+	beego.Router("/api/patient/returncheckpatientcount", &PatientApiController{}, "Get:ReturnCheckPatientCount")
+
 }
 func (c *PatientApiController) GetExportList() {
 	startTime := c.GetString("start_time")
@@ -1520,6 +1530,7 @@ func (c *PatientApiController) CreateDryWeights() {
 }
 
 func (c *PatientApiController) CreateGroupAdvice() {
+
 	var err error
 	defer func() {
 		if rec := recover(); rec != nil {
@@ -1554,17 +1565,17 @@ func (c *PatientApiController) CreateGroupAdvice() {
 	}
 	utils.ErrorLog("%v", dataBody)
 
-	appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
-	if appRole.UserType == 3 {
-		headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
-		if getPermissionErr != nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
-			return
-		} else if headNursePermission == nil {
-			c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateAdvice)
-			return
-		}
-	}
+	//appRole, _ := service.FindAdminRoleTypeById(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id, adminUserInfo.CurrentAppId)
+	//if appRole.UserType == 3 {
+	//	headNursePermission, getPermissionErr := service.GetAdminUserSpecialPermission(adminUserInfo.CurrentOrgId, adminUserInfo.CurrentAppId, adminUserInfo.AdminUser.Id, models.SpecialPermissionTypeHeadNurse)
+	//	if getPermissionErr != nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	//		return
+	//	} else if headNursePermission == nil {
+	//		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCreateAdvice)
+	//		return
+	//	}
+	//}
 
 	timeLayout := "2006-01-02"
 	loc, _ := time.LoadLocation("Local")
@@ -1575,6 +1586,8 @@ func (c *PatientApiController) CreateGroupAdvice() {
 		return
 	}
 	adviceType := int64(dataBody["advice_type"].(float64))
+
+	fmt.Println("adviceType----------------", adviceType)
 	if adviceType != 1 && adviceType != 2 && adviceType != 3 && adviceType != 4 {
 		utils.ErrorLog("advice_type != 1&&2")
 		c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
@@ -9060,3 +9073,133 @@ func (this *PatientApiController) GetInspectionByProjectId() {
 		"inspection": inspection,
 	})
 }
+
+func (this *PatientApiController) GetPatientMapList() {
+
+	keyword := this.GetString("keyword")
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	patient, _ := service.GetPatientMapList(orgId, keyword)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patient,
+	})
+}
+
+func (this *PatientApiController) SavePatientCount() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+
+	creater := this.GetAdminUserInfo().AdminUser.Id
+
+	patient_id, _ := this.GetInt64("patient_id")
+
+	hd_count, _ := this.GetInt64("hd_count")
+
+	hdf_count, _ := this.GetInt64("hdf_count")
+
+	hdhp_count, _ := this.GetInt64("hdhp_count")
+
+	hp_count, _ := this.GetInt64("hp_count")
+
+	other_count, _ := this.GetInt64("other_count")
+
+	remark := this.GetString("remark")
+
+	recordDateStr := time.Now().Format("2006-01-02")
+	recordDate, _ := utils.ParseTimeStringToTime("2006-01-02", recordDateStr)
+
+	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()
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	service.CreatePatientInCount(tx, patientInCount)
+
+	service.ModifyPatientCount(tx, hd_count, hdf_count, hdhp_count, hp_count, patient_id)
+
+	tx.Commit()
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patientInCount": patientInCount,
+	})
+
+}
+
+func (this *PatientApiController) GetPatientCountList() {
+
+	orgId := this.GetAdminUserInfo().CurrentOrgId
+	patient_id, _ := this.GetInt64("patient_id")
+	page, _ := this.GetInt64("page")
+	limit, _ := this.GetInt64("limit")
+	patient, total, _ := service.GetPatientCountList(orgId, patient_id, page, limit)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patient": patient,
+		"total":   total,
+	})
+}
+
+func (this *PatientApiController) CheckPatientCount() {
+
+	id, _ := this.GetInt64("id")
+
+	checkpatientcount, _ := service.CheckPatientCount(id)
+
+	this.ServeSuccessJSON(map[string]interface{}{
+		"checkpatientcount": checkpatientcount,
+	})
+}
+
+func (this *PatientApiController) ReturnCheckPatientCount() {
+
+	id, _ := this.GetInt64("id")
+
+	db := service.XTWriteDB()
+	// 开始外部循环的事务
+	tx := db.Begin()
+	// 在函数结束时处理事务回滚
+	defer func() {
+		if r := recover(); r != nil {
+			tx.Rollback()
+		}
+	}()
+
+	patientCount, _ := service.ReturnCheckPatientCount(id)
+
+	patientCountObj, _ := service.GetPatientCountById(id)
+
+	service.UpdatePatientInCount(tx, patientCountObj.HdCount, patientCountObj.HdfCount, patientCountObj.HdhpCount, patientCountObj.HpCount, patientCountObj.PatientId)
+
+	tx.Commit()
+	this.ServeSuccessJSON(map[string]interface{}{
+		"patientCount": patientCount,
+	})
+
+}

controllers/sign_api_controller.go

@@ -1525,63 +1525,73 @@ func (this *SignApiController) ToAutoDiagnose() {
 
 	//
 
-	adviceInfo, _ := service.GetHisDoctorAdviceByUserOrgId(10752)
-	adminInfo := this.GetAdminUserInfo()
-	db := service.XTWriteDB()
-	tx := db.Begin()
-	if len(adviceInfo) > 0 {
-		for _, item := range adviceInfo {
-
-			drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, item.DrugId)
-			var local_count int64
-			if item.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
-
-				prescribingNumberTenty := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
-				prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-
-				local_count += prescribingNumberSevenTy * drug.MinNumber
-			}
-
-			if item.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
-
-				prescribingNumberTenty := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
-				prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-				local_count += prescribingNumberSevenTy
-			}
-
-			if item.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
-
-				prescribingNumberTenty := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
-				prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
-				local_count += prescribingNumberSevenTy
-			}
-
-			item.PrescribingNumberUnit = drug.MinUnit
-
-			service.BloodNewHisDrugsDelivery(item.UserOrgId, 5685, item, tx)
+	//adviceInfo, _ := service.GetHisDoctorAdviceByUserOrgId(10752)
+	//adminInfo := this.GetAdminUserInfo()
+	//db := service.XTWriteDB()
+	//tx := db.Begin()
+	//if len(adviceInfo) > 0 {
+	//	for _, item := range adviceInfo {
+	//
+	//		drug, _ := service.FindBaseDrugLibRecordSeven(adminInfo.CurrentOrgId, item.DrugId)
+	//		var local_count int64
+	//		if item.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit != drug.MinUnit {
+	//
+	//			prescribingNumberTenty := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
+	//			prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+	//
+	//			local_count += prescribingNumberSevenTy * drug.MinNumber
+	//		}
+	//
+	//		if item.PrescribingNumberUnit == drug.MinUnit && drug.MaxUnit != drug.MinUnit {
+	//
+	//			prescribingNumberTenty := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
+	//			prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+	//			local_count += prescribingNumberSevenTy
+	//		}
+	//
+	//		if item.PrescribingNumberUnit == drug.MaxUnit && drug.MaxUnit == drug.MinUnit {
+	//
+	//			prescribingNumberTenty := strconv.FormatFloat(item.PrescribingNumber, 'f', -1, 64)
+	//			prescribingNumberSevenTy, _ := strconv.ParseInt(prescribingNumberTenty, 10, 64)
+	//			local_count += prescribingNumberSevenTy
+	//		}
+	//
+	//		item.PrescribingNumberUnit = drug.MinUnit
+	//
+	//		service.BloodNewHisDrugsDelivery(item.UserOrgId, 5685, item, tx)
+	//
+	//		storeConfig, _ := service.GetNewAllStoreHouseConfig(item.UserOrgId, tx)
+	//
+	//		stockInfo, _ := service.GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId, tx)
+	//		var sum_count int64
+	//		for _, its := range stockInfo {
+	//			baseDrug, _ := service.GetNewBaseDrugMedical(its.DrugId, tx)
+	//			if its.MaxUnit == baseDrug.MaxUnit {
+	//				its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
+	//			}
+	//			sum_count += its.StockMaxNumber + its.StockMinNumber
+	//		}
+	//		//更新基础库存
+	//		service.UpdateNewBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId, tx)
+	//		//剩余库存
+	//		service.UpdateNewDrugStockCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut, sum_count, tx)
+	//
+	//		over, _ := service.FindNewOverCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut, tx)
+	//		service.UpdateNewActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount, tx)
+	//	}
+	//}
 
-			storeConfig, _ := service.GetNewAllStoreHouseConfig(item.UserOrgId, tx)
+	//tx.Commit()
+	schedule, _ := service.CheckSchedule()
 
-			stockInfo, _ := service.GetNewDrugAllStockInfo(storeConfig.DrugStorehouseOut, item.UserOrgId, item.DrugId, tx)
-			var sum_count int64
-			for _, its := range stockInfo {
-				baseDrug, _ := service.GetNewBaseDrugMedical(its.DrugId, tx)
-				if its.MaxUnit == baseDrug.MaxUnit {
-					its.StockMaxNumber = its.StockMaxNumber * baseDrug.MinNumber
-				}
-				sum_count += its.StockMaxNumber + its.StockMinNumber
-			}
-			//更新基础库存
-			service.UpdateNewBaseDrugSumTwo(item.DrugId, sum_count, item.UserOrgId, tx)
-			//剩余库存
-			service.UpdateNewDrugStockCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut, sum_count, tx)
+	if len(schedule) > 0 {
+		for _, item := range schedule {
+			fmt.Println("item.p------------------", item.PatientId)
 
-			over, _ := service.FindNewOverCount(item.DrugId, item.UserOrgId, storeConfig.DrugStorehouseOut, tx)
-			service.UpdateNewActOut(over.ID, over.SumInCount, over.FlushCount, over.SumCancelCount, tx)
+			service.UpdateScheduleByIdOneList(item.ID, item.ScheduleDate, item.ScheduleType, item.ScheduleWeek, item.Status, item.PatientId, item.PartitionId, item.BedId, item.DialysisMachineName, item.UserOrgId, item.ModeId)
 		}
 	}
 
-	tx.Commit()
 	this.ServeSuccessJSON(map[string]interface{}{
 		"msg": "ok",
 	})
@@ -1811,3 +1821,8 @@ func (this *SignApiController) ToCheckQuery() {
 		"msg": "ok",
 	})
 }
+
+func (this *SignApiController) CheckSchedule() {
+
+	service.CheckSchedule()
+}

models/dialysis.go

@@ -346,6 +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"`
 }
 
 func (PredialysisEvaluationList) TableName() string {

models/patient_models.go

@@ -27,6 +27,7 @@ type MSchedualPatientList struct {
 	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
 	IsInfectious       int64  `gorm:"column:is_infectious" json:"is_infectious" form:"is_infectious"`
+	Height             int64  `gorm:"column:height" json:"height" form:"height"`
 }
 
 func (MSchedualPatientList) TableName() string {
@@ -3121,3 +3122,42 @@ type XtInspectionOne struct {
 	UpdatedTime  int64  `gorm:"column:updated_time" json:"updated_time" form:"updated_time"`
 	Count        int64
 }
+
+type SfPatients 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"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
+	Status      int64  `gorm:"column:status" json:"status" form:"status"`
+	Lapseto     int64  `gorm:"column:lapseto" json:"lapseto" form:"lapseto"`
+	FirstLetter string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	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"`
+}
+
+func (SfPatients) TableName() string {
+	return "xt_patients"
+}
+
+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"`
+	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"`
+	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"`
+	Remark     string `gorm:"column:remark" json:"remark" form:"remark"`
+	OtherCount int64  `gorm:"column:other_count" json:"other_count" form:"other_count"`
+}
+
+func (SfPatientInCount) TableName() string {
+	return "xt_patient_in_count"
+}

service/db.go

@@ -26,6 +26,7 @@ import (
 
 var readDb *gorm.DB
 var readDb2 *gorm.DB
+var readDb3 *gorm.DB
 var writeDb *gorm.DB
 var readUserDb *gorm.DB
 var writeUserDb *gorm.DB
@@ -33,6 +34,8 @@ var writeUserDb *gorm.DB
 var readMiddleDb *gorm.DB
 var writeMiddleDb *gorm.DB
 
+var newReadMiddleDb *gorm.DB
+
 var readPatientDb *gorm.DB
 var writePatientDb *gorm.DB
 
@@ -57,6 +60,12 @@ func ConnectDB() {
 	readPass2 := beego.AppConfig.String("readmysqlpass2")
 	readName2 := beego.AppConfig.String("readmysqlname2")
 
+	readHost3 := beego.AppConfig.String("readmysqlhost3")
+	readPort3 := beego.AppConfig.String("readmysqlport3")
+	readUser3 := beego.AppConfig.String("readmysqluser3")
+	readPass3 := beego.AppConfig.String("readmysqlpass3")
+	readName3 := beego.AppConfig.String("readmysqlname3")
+
 	writeHost := beego.AppConfig.String("writemysqlhost")
 	writePort := beego.AppConfig.String("writemysqlport")
 	writeUser := beego.AppConfig.String("writemysqluser")
@@ -127,6 +136,8 @@ func ConnectDB() {
 
 	rdsn2 := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser2, readPass2, readHost2, readPort2, readName2)
 
+	rdsn3 := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUser3, readPass3, readHost3, readPort3, readName3)
+
 	wdsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", writeUser, writePass, writeHost, writePort, writeName)
 
 	rudsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?charset=utf8mb4&parseTime=true", readUserUser, readUserPass, readUserHost, readUserPort, readUserName)
@@ -146,6 +157,8 @@ func ConnectDB() {
 
 	readDb2, err = gorm.Open("mysql", rdsn2)
 
+	readDb3, err = gorm.Open("mysql", rdsn3)
+
 	readDb, err = gorm.Open("mysql", rdsn)
 	if err != nil {
 		//beego.Error(err)
@@ -158,6 +171,10 @@ func ConnectDB() {
 	readDb2.DB().SetMaxOpenConns(100)
 	readDb2.LogMode(true)
 
+	readDb3.DB().SetMaxIdleConns(10)
+	readDb3.DB().SetMaxOpenConns(100)
+	readDb3.LogMode(true)
+
 	writeDb, err = gorm.Open("mysql", wdsn)
 	if err != nil {
 		//beego.Error(err)

service/dialysis_service.go

@@ -1074,6 +1074,18 @@ func DeleteDoctorAdviceByGroupNo(m *models.DoctorAdvice) (err error) {
 	return
 }
 
+func DeleteDoctorAdviceByGroupNoOne(m *models.DoctorAdvice) (err error) {
+	ut := writeDb.Begin()
+	err = ut.Model(&models.DoctorAdvice{}).Where("groupno = ? AND user_org_id =  ? and patient_id = ? and advice_date = ?", m.GroupNo, m.UserOrgId, m.PatientId, m.AdviceDate).Update(map[string]interface{}{"UpdatedTime": m.UpdatedTime, "Status": 0, "modifier": m.Modifier}).Error
+	if err != nil {
+		ut.Rollback()
+		return
+	}
+	ut.Commit()
+
+	return
+}
+
 func GetDialysisBoard(orgID int64, scheduleDate int64, offset, limit int64) ([]*models.DialysisBoardVM, error) {
 	var boards []*models.DialysisBoardVM
 	db := readDb.

service/mobile_dialysis_service.go

@@ -195,6 +195,7 @@ type MSchedualPatientVMList struct {
 	SchRemark          string `gorm:"column:sch_remark" json:"sch_remark" form:"sch_remark"`
 	ScheduleRemark     string `gorm:"column:schedule_remark" json:"schedule_remark" form:"schedule_remark"`
 	FirstLetter        string `gorm:"column:first_letter" json:"first_letter" form:"first_letter"`
+	Height             int64  `gorm:"column:height" json:"height" form:"height"`
 }
 
 func (MSchedualPatientVMList) TableName() string {
@@ -8619,7 +8620,6 @@ func GetHisDoctorAdvicesTwentyOne(orgID int64, scheduleDate int64, deliverWay st
 		}
 		if patient_id > 0 {
 			if execution_state > 0 {
-				fmt.Println("execution_state---------------------", execution_state)
 				if cost_type > 0 {
 					db = db.Preload("SchedualPatient", "status = 1 AND user_org_id = ? and id = ?", orgID, patient_id).
 						Preload("DeviceNumber", "status = 1 AND org_id = ?", orgID).

service/patient_service.go

@@ -687,12 +687,26 @@ func FindPatientByIdWithDiseases(orgID int64, id int64) (patient models.Patients
 }
 
 func FindPatientWithDeviceByNo(orgID int64, no string, time int64) (patient models.SchedualPatient2, err error) {
-	err = readDb.Preload("DialysisSchedule", func(db *gorm.DB) *gorm.DB {
-		return db.Preload("DeviceNumber", "org_id = ?", orgID).
-			Preload("DeviceZone", "org_id = ?", orgID).
-			Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
-	}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status = 1 ", orgID, no).First(&patient).Error
+
+	if orgID != 9882 {
+		err = readDb.Preload("DialysisSchedule", func(db *gorm.DB) *gorm.DB {
+			return db.Preload("DeviceNumber", "org_id = ?", orgID).
+				Preload("DeviceZone", "org_id = ?", orgID).
+				Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
+		}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status = 1 ", orgID, no).First(&patient).Error
+	}
+
+	if orgID == 9882 {
+		err = readDb.Preload("DialysisSchedule", func(db *gorm.DB) *gorm.DB {
+			return db.Preload("DeviceNumber", "org_id = ?", orgID).
+				Preload("DeviceZone", "org_id = ?", orgID).
+				Where("user_org_id = ? AND schedule_date = ? ", orgID, time)
+		}).Preload("InfectiousDiseases", "status = 1").Where("user_org_id=? and dialysis_no = ? and status = 1 and  lapseto =1", orgID, no).First(&patient).Error
+
+	}
+
 	return
+
 }
 
 func FindPatientWithDeviceByPatientId(orgID int64, id int64, time int64) (patient models.SchedualPatient2, err error) {
@@ -5050,3 +5064,99 @@ func ModifyExecutionAdvice(id int64, execution_staff int64, ExecutionTime int64)
 
 	return err
 }
+
+func GetPatientMapList(user_org_id int64, keyword string) (patient []*models.SfPatients, err error) {
+
+	keyword = "%" + keyword + "%"
+
+	err = XTReadDB().Where("user_org_id = ? and status=1 and lapseto =1 and (name like ? or first_letter like ?)", user_org_id, keyword, keyword).Find(&patient).Error
+
+	return patient, err
+}
+
+func CreatePatientInCount(tx *gorm.DB, patientCount models.SfPatientInCount) error {
+
+	err := tx.Create(&patientCount).Error
+
+	if err != nil {
+		tx.Rollback()
+		return 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) {
+
+	patients := models.SfPatients{}
+
+	err = tx.Model(&patients).Where("id = ?", patient_id).UpdateColumn("hd_count", gorm.Expr("hd_count + ?", hd_count)).Error
+
+	err = tx.Model(&patients).Where("id = ?", patient_id).UpdateColumn("hdf_count", gorm.Expr("hdf_count + ?", hdf_count)).Error
+
+	err = tx.Model(&patients).Where("id=?", patient_id).UpdateColumn("hdhp_count", gorm.Expr("hdhp_count + ?", hdhp_count)).Error
+
+	err = tx.Model(&patients).Where("id=?", patient_id).UpdateColumn("hp_count", gorm.Expr("hp_count + ?", hp_count)).Error
+
+	return patients, err
+}
+
+func UpdatePatientInCount(tx *gorm.DB, hd_count int64, hdf_count int64, hdhp_count int64, hp_count int64, patient_id int64) (models.SfPatients, error) {
+
+	patients := models.SfPatients{}
+
+	err = tx.Model(&patients).Where("id = ?", patient_id).UpdateColumn("hd_count", gorm.Expr("hd_count - ?", hd_count)).Error
+
+	err = tx.Model(&patients).Where("id = ?", patient_id).UpdateColumn("hdf_count", gorm.Expr("hdf_count - ?", hdf_count)).Error
+
+	err = tx.Model(&patients).Where("id=?", patient_id).UpdateColumn("hdhp_count", gorm.Expr("hdhp_count - ?", hdhp_count)).Error
+
+	err = tx.Model(&patients).Where("id=?", patient_id).UpdateColumn("hp_count", gorm.Expr("hp_count - ?", hp_count)).Error
+
+	return patients, err
+}
+
+func GetPatientCountList(user_org_id int64, patient_id int64, page int64, limit int64) (patient []*models.SfPatientInCount, total int64, err error) {
+
+	db := XTReadDB().Model(&patient).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)
+	}
+
+	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) {
+
+	patientInCount := models.SfPatientInCount{}
+
+	err = XTWriteDB().Model(&patientInCount).Where("id = ?", id).Updates(map[string]interface{}{"is_check": 1}).Error
+
+	return patientInCount, err
+}
+
+func ReturnCheckPatientCount(id int64) (models.SfPatientInCount, error) {
+
+	patientInCount := models.SfPatientInCount{}
+
+	err = XTWriteDB().Model(&patientInCount).Where("id = ?", id).Updates(map[string]interface{}{"is_check": 2}).Error
+
+	return patientInCount, err
+}
+
+func GetPatientCountById(id int64) (models.SfPatientInCount, error) {
+
+	patientInCount := models.SfPatientInCount{}
+
+	err := XTReadDB().Where("id = ?", id).Find(&patientInCount).Error
+
+	return patientInCount, err
+}

service/sign_service.go

@@ -2192,7 +2192,7 @@ func UpdateScheduleByOrder(patient_id int64, schedule_date int64, user_org_id in
 
 func GetScheduleListByOrder(user_org_id int64) (list []*models.XtSchedule, err error) {
 
-	err = XTReadDB().Where("user_org_id = ? and schedule_date >=? and status =1 and schedule_date<=?", 10579, 1703260800, 1703347200).Find(&list).Error
+	err = XTReadDB().Where("user_org_id = ? and schedule_date >=? and status =1 and schedule_date<=?", 10579, 1741795200, 1742054400).Find(&list).Error
 	return list, err
 }
 
@@ -2485,3 +2485,17 @@ func BloodNewHisDrugsDelivery(orgID int64, creater int64, advice *models.HisDoct
 
 	return
 }
+
+func CheckSchedule() (schedule []*models.XtSchedule, err error) {
+
+	err = readDb3.Where("user_org_id = 10445 and schedule_date<1741536000").Find(&schedule).Error
+
+	return schedule, err
+}
+
+func UpdateScheduleByIdOneList(id int64, schedule_date int64, schedule_type int64, schedule_week int64, status int64, patient_id int64, partition_id int64, bed_id int64, dialysis_machine_name string, user_org_id int64, mode_id int64) error {
+
+	err := XTWriteDB().Model(&models.XtSchedule{}).Where("id = ?", id).Updates(map[string]interface{}{"schedule_date": schedule_date, "schedule_type": schedule_type, "schedule_week": schedule_week, "status": status, "patient_id": patient_id, "partition_id": partition_id, "bed_id": bed_id, "dialysis_machine_name": dialysis_machine_name, "user_org_id": user_org_id, "mode_id": mode_id}).Error
+
+	return err
+}