合并代码

controllers/dialysis_api_controller.go

@@ -5022,9 +5022,7 @@ func (this *DialysisApiController) GetFuncPurview() {
 		} else {
 			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeAdminUserIsExit)
 			return
-
 		}
-
 	} else {
 		this.ServeSuccessJSON(map[string]interface{}{
 			"is_has_create":       true,
@@ -5037,7 +5035,5 @@ func (this *DialysisApiController) GetFuncPurview() {
 			"is_has_modify_exce":  true,
 			"module":              true,
 		})
-
 	}
-
 }

controllers/patient_api_controller.go

@@ -69,6 +69,9 @@ func PatientApiRegistRouters() {
 	beego.Router("/api/patients/export", &PatientApiController{}, "Post:ExportPatients")
 
 	beego.Router("/api/patients/advices/saveditadvices", &PatientApiController{}, "Get:SaveEditAdvices")
+
+	beego.Router("/api/patients/dialysis_no", &PatientApiController{}, "Get:GetMaxDialysisNo")
+
 }
 
 //GetPatientsList 取患者列表
@@ -3383,12 +3386,12 @@ func (c *PatientApiController) GetPatientScheduleOne() {
 
 func (c *PatientApiController) ExportPatients() {
 	dataBody := make(map[string]interface{}, 0)
-	dialysisNo := service.ChechLastDialysisNo(c.GetAdminUserInfo().CurrentOrgId)
-	if dialysisNo == 0 {
-		dialysisNo = 1
-	} else {
-		dialysisNo++
-	}
+
+	all_patient, _, _ := service.GetAllPatientList(c.GetAdminUserInfo().CurrentOrgId)
+
+	//all_patient, _,_ := service.GetAllPatientList(c.GetAdminUserInfo().CurrentOrgId )
+
+	org, _ := service.GetOrgById(c.GetAdminUserInfo().CurrentOrgId)
 
 	err := json.Unmarshal(c.Ctx.Input.RequestBody, &dataBody)
 	if err != nil {
@@ -3399,7 +3402,6 @@ func (c *PatientApiController) ExportPatients() {
 	export_time := time.Now().Unix()
 	var patients []*models.Patients
 	var total_patients []interface{}
-
 	if dataBody["patients"] != nil || reflect.TypeOf(dataBody["patients"]).String() == "[]interface {}" {
 		tempPatients := dataBody["patients"].([]interface{})
 		total_patients = tempPatients
@@ -3461,9 +3463,16 @@ func (c *PatientApiController) ExportPatients() {
 					service.CreateExportErrLog(&err_log)
 					continue
 				} else {
+					var tempPatient *models.Patients
+					for _, item := range all_patient {
+						if item.Phone == phone {
+							tempPatient = item
+						}
+					}
+
 					//需要判断该号码是否已经在系统内存在了，存在了则生成一条导入错误日志
-					count := service.FindPatientPhoneIsExist(phone, c.GetAdminUserInfo().CurrentOrgId)
-					if count > 0 {
+					//count := service.FindPatientPhoneIsExist(phone, c.GetAdminUserInfo().CurrentOrgId)
+					if tempPatient != nil && tempPatient.ID > 0 {
 						err_log := models.ExportErrLog{
 							LogType:    1,
 							UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
@@ -3482,8 +3491,7 @@ func (c *PatientApiController) ExportPatients() {
 
 			if patientNameM["id_card_no"] != nil || reflect.TypeOf(patientNameM["id_card_no"]).String() == "string" {
 				id_card_no, _ := patientNameM["id_card_no"].(string)
-				fmt.Println(id_card_no)
-
+				fmt.Println(IsIdCard(id_card_no))
 				if IsIdCard(id_card_no) == false { //身份证号码不符合要求则生成一条导入错误日志
 					err_log := models.ExportErrLog{
 						LogType:    1,
@@ -3497,8 +3505,14 @@ func (c *PatientApiController) ExportPatients() {
 					service.CreateExportErrLog(&err_log)
 					continue
 				} else {
-					count := service.FindPatientIdCardNoIsExist(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
-					if count > 0 {
+					var tempPatient *models.Patients
+					for _, item := range all_patient {
+						if item.IdCardNo == id_card_no {
+							tempPatient = item
+						}
+					}
+					//count := service.FindPatientIdCardNoIsExist(id_card_no, c.GetAdminUserInfo().CurrentOrgId)
+					if tempPatient != nil && tempPatient.ID > 0 {
 						err_log := models.ExportErrLog{
 							LogType:    1,
 							UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
@@ -3633,16 +3647,51 @@ func (c *PatientApiController) ExportPatients() {
 				patient.Diagnose = diagnose
 
 			}
-			dialysisNo = dialysisNo + int64(index)
 
-			no := strconv.FormatInt(dialysisNo, 10)
-			rep := 3 - len(no)
+			if patientNameM["dialysis_no"] != nil || reflect.TypeOf(patientNameM["dialysis_no"]).String() == "string" {
+				dialysis_no, _ := patientNameM["dialysis_no"].(string)
+
+				var tempPatient *models.Patients
+				for _, item := range all_patient {
+					if item.DialysisNo == dialysis_no {
+						tempPatient = item
+					}
+				}
+				if tempPatient != nil && tempPatient.ID > 0 {
+					err_log := models.ExportErrLog{
+						LogType:    1,
+						UserOrgId:  c.GetAdminUserInfo().CurrentOrgId,
+						ErrMsg:     "第" + strconv.Itoa(index+3) + "行" + "的透析号在系统中已经存在",
+						Status:     1,
+						CreateTime: time.Now().Unix(),
+						UpdateTime: time.Now().Unix(),
+						ExportTime: export_time,
+					}
+					service.CreateExportErrLog(&err_log)
+					continue
+				}
+
+				patient.DialysisNo = dialysis_no
+
+			}
+
+			if patientNameM["height"] != nil || reflect.TypeOf(patientNameM["height"]).String() == "string" {
+				height, _ := patientNameM["height"].(string)
+				heights, _ := strconv.ParseFloat(height, 64)
+				patient.Height = int64(heights)
+			}
+
+			if patientNameM["home_address"] != nil || reflect.TypeOf(patientNameM["home_address"]).String() == "string" {
+				home_address, _ := patientNameM["home_address"].(string)
+				patient.HomeAddress = home_address
+			}
+			if patientNameM["dry_weight"] != nil || reflect.TypeOf(patientNameM["dry_weight"]).String() == "string" {
+				dry_weight, _ := patientNameM["dry_weight"].(string)
+				dry_weights, _ := strconv.ParseFloat(dry_weight, 64)
+				patient.DryWeight = dry_weights
 
-			if rep > 0 {
-				no = strings.Repeat("0", rep) + no
 			}
 
-			patient.DialysisNo = no
 			patient.CreatedTime = time.Now().Unix()
 			patient.UpdatedTime = time.Now().Unix()
 			patient.Status = 1
@@ -3656,7 +3705,7 @@ func (c *PatientApiController) ExportPatients() {
 
 	if len(patients) > 0 {
 		for _, item := range patients {
-			service.CreateExportPatient(item, item.ContagionIds)
+			service.CreateExportPatient(item, item.ContagionIds, org.Creator)
 		}
 
 		log := models.ExportLog{
@@ -3728,9 +3777,9 @@ func (c *PatientApiController) SaveEditAdvices() {
 	adminInfo := c.GetAdminUserInfo()
 	orgid := adminInfo.CurrentOrgId
 	startTime := c.GetString("start_time")
-	fmt.Println("开始时间", startTime)
+
 	theTime, _ := utils.ParseTimeStringToTime("2006-01-02 15:04", startTime)
-	fmt.Println(theTime.Unix())
+
 	groupno, _ := c.GetInt64("groupno")
 	fmt.Println("组", groupno)
 	date, _ := c.GetInt64("date")
@@ -3749,3 +3798,11 @@ func (c *PatientApiController) SaveEditAdvices() {
 		"advice": advice,
 	})
 }
+
+func (c *PatientApiController) GetMaxDialysisNo() {
+	dialysisNo := service.ChechLastDialysisNo(c.GetAdminUserInfo().CurrentOrgId)
+	c.ServeSuccessJSON(map[string]interface{}{
+		"dialysis_no": dialysisNo,
+	})
+
+}

controllers/schedule_api_controller.go

@@ -1349,6 +1349,9 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 				return
 			}
 
+			partition_name, _ := schMapM["partition_name"].(string)
+			zone, _ := service.FindDeviceZoneByName(partition_name, this.GetAdminUserInfo().CurrentOrgId)
+
 			device_number_name, _ := schMapM["device_number_name"].(string)
 			if len(device_number_name) == 0 { //分区为空
 				log := models.ExportLog{
@@ -1380,7 +1383,7 @@ func (this *ScheduleApiController) ExportScheduleTemplate() {
 				return
 
 			} else {
-				device, err := service.FindDeviceByNameTwo(device_number_name, this.GetAdminUserInfo().CurrentOrgId)
+				device, err := service.FindDeviceByNameTwo(device_number_name, this.GetAdminUserInfo().CurrentOrgId, zone.ID)
 				if err == nil {
 					if len(device) == 0 { //没查到数据，插入错误日志
 						log := models.ExportLog{

models/patient_models.go

@@ -89,6 +89,7 @@ type Patients struct {
 	IsExcelExport            int64  `gorm:"column:is_excel_export" json:"is_excel_export" form:"is_excel_export"`
 
 	ContagionIds []int64 `gorm:"-"`
+	DryWeight    float64 `gorm:"-"`
 }
 
 func (Patients) TableName() string {

service/patient_service.go

@@ -1162,7 +1162,7 @@ func GetPatientScheduleOne(patientid int64, nowdate int64, orgid int64) (models.
 	return schedule, err
 }
 
-func CreateExportPatient(patient *models.Patients, contagions []int64) (err error) {
+func CreateExportPatient(patient *models.Patients, contagions []int64, org_creator int64) (err error) {
 	user, _ := GetSgjUserByMobild(patient.Phone)
 	customer, _ := GetSgjCoustomerByMobile(patient.UserOrgId, patient.Phone)
 	utx := writeDb.Begin()
@@ -1217,6 +1217,19 @@ func CreateExportPatient(patient *models.Patients, contagions []int64) (err erro
 		return
 	}
 
+	var dryWeight models.SgjPatientDryweight
+	dryWeight.PatientId = patient.ID
+	dryWeight.UserOrgId = patient.UserOrgId
+	dryWeight.Status = 1
+	dryWeight.AdjustedValue = "/"
+	dryWeight.Creator = org_creator
+	dryWeight.UserId = org_creator
+	dryWeight.Ctime = time.Now().Unix()
+	dryWeight.Mtime = time.Now().Unix()
+	dryWeight.DryWeight = patient.DryWeight
+	dryWeight.Remakes = ""
+	err = utx.Create(&dryWeight).Error
+
 	var lapseto models.PatientLapseto
 	lapseto.PatientId = patient.ID
 	lapseto.LapsetoType = patient.Lapseto

service/schedule_service.go

@@ -375,8 +375,8 @@ func FindSchedualExportLog(org_id int64, export_time int64) (errLogs []*models.E
 	return
 }
 
-func FindDeviceByNameTwo(device_name string, org_id int64) (devices []*models.DeviceNumber, err error) {
-	err = readDb.Model(&models.DeviceNumber{}).Where("org_id = ? AND number = ? AND status = 1", org_id, device_name).Find(&devices).Error
+func FindDeviceByNameTwo(device_name string, org_id int64, zone_id int64) (devices []*models.DeviceNumber, err error) {
+	err = readDb.Model(&models.DeviceNumber{}).Where("org_id = ? AND number = ? AND status = 1 AND zone_id = ?", org_id, device_name, zone_id).Find(&devices).Error
 	return
 }