hahah

controllers/base_api_controller.go

@@ -94,7 +94,7 @@ func (this *BaseAuthAPIController) Prepare() {
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentAppId = 17733 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)
@@ -340,7 +340,7 @@ func (this *BaseServeAPIController) Prepare() {
 		subscibes[4] = &subscibe
 		var adminUserInfo service.AdminUserInfo
 		adminUserInfo.CurrentOrgId = 10164 //机构id小英9675或4
-		adminUserInfo.CurrentAppId = 12123 //4
+		adminUserInfo.CurrentAppId = 17733 //4
 		adminUserInfo.AdminUser = &userAdmin
 		adminUserInfo.Subscibes = subscibes
 		this.SetSession("admin_user_info", &adminUserInfo)

controllers/manage_api_controller.go

@@ -255,6 +255,11 @@ func (this *MachineApiController) SaveManageInfo() {
 	home_address := dataBody["home_address"].(string)
 
 	home_setting := dataBody["home_setting"].(string)
+
+	home_type := dataBody["home_type"].(string)
+
+	home_big_type := dataBody["home_big_type"].(string)
+
 	ids := make([]int64, 0)
 	for _, treat := range treat_types {
 		id := int64(treat.(float64))
@@ -300,6 +305,8 @@ func (this *MachineApiController) SaveManageInfo() {
 		UserOrgId:           orgid,
 		HomeAddress:         home_address,
 		HomeSetting:         home_setting,
+		HomeType:            home_type,
+		HomeBigType:         home_big_type,
 	}
 	err = service.CreateMacher(addmacher)
 	if err != nil {
@@ -382,6 +389,9 @@ func (this *MachineApiController) UpdateMachineInfo() {
 	treat_types := dataBody["treat_type"].([]interface{})
 	home_address := dataBody["home_address"].(string)
 	home_setting := dataBody["home_setting"].(string)
+	home_type := dataBody["home_type"].(string)
+
+	home_big_type := dataBody["home_big_type"].(string)
 	ids := make([]int64, 0)
 	for _, treat := range treat_types {
 		id := int64(treat.(float64))
@@ -421,6 +431,8 @@ func (this *MachineApiController) UpdateMachineInfo() {
 		ZoneId:              zone_id,
 		HomeAddress:         home_address,
 		HomeSetting:         home_setting,
+		HomeType:            home_type,
+		HomeBigType:         home_big_type,
 	}
 	err = service.UpdateMachine(id, orgid, &addmacher)
 	errors := service.UpdateTreatMode(id, orgid, ids)

controllers/mobile_api_controllers/patient_api_controller.go

@@ -1696,7 +1696,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 							if medical.IsUse != 1 {
 								if (list.Count*medical.MinNumber + list.StockMinNumber) == 0 {
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && advice.UserOrgId != 10724 && advice.UserOrgId != 10571 && advice.UserOrgId != 10731 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && advice.UserOrgId != 10724 && advice.UserOrgId != 10571 && advice.UserOrgId != 10731 && advice.UserOrgId != 10610 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -1712,7 +1712,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 
 								}
 								if prescribing_number_total > total {
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && advice.UserOrgId != 10724 && advice.UserOrgId != 10571 && advice.UserOrgId != 10731 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && advice.UserOrgId != 10724 && advice.UserOrgId != 10571 && advice.UserOrgId != 10731 && advice.UserOrgId != 10610 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -1739,7 +1739,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 											//查询今日是否出库
 											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 											if drugOutInfo.ID == 0 {
-												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
+												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 && item.UserOrgId != 10610 {
 													service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 												}
 
@@ -1749,7 +1749,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										if pharmacyConfig.IsOpen != 1 {
 											drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 											if drugOutInfo.ID == 0 {
-												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
+												if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 && item.UserOrgId != 10610 {
 													service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 												}
 
@@ -1776,7 +1776,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									if pharmacyConfig.IsOpen == 1 && medical.IsPharmacy == 0 {
 										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 										if drugOutInfo.ID == 0 {
-											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
+											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 && item.UserOrgId != 10610 {
 												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 											}
 
@@ -1800,7 +1800,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 										service.CreateDrugError(drugError)
 										drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 										if drugOutInfo.ID == 0 {
-											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
+											if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 && item.UserOrgId != 10610 {
 												service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 											}
 
@@ -1893,7 +1893,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									return
 								}
 								if prescribing_number_total > total {
-									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
+									if advice.UserOrgId != 10278 && advice.UserOrgId != 10697 && advice.UserOrgId != 10635 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 && item.UserOrgId != 10610 {
 										service.UpdateDoctorAdviceByExcecute(advice.ID, advice.UserOrgId)
 										advice.ExecutionTime = 0
 										advice.ExecutionState = 2
@@ -1912,7 +1912,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									//查询今日是否出库
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
+										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 && item.UserOrgId != 10610 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 										}
 
@@ -1922,7 +1922,7 @@ func (c *PatientApiController) ExecDoctorAdvice() {
 									//查询今日是否出库
 									drugOutInfo, _ := service.GetAdviceIsOut(item.ID, item.UserOrgId, item.PatientId, item.AdviceDate, item.DrugId)
 									if drugOutInfo.ID == 0 {
-										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 {
+										if item.UserOrgId != 10644 && item.UserOrgId != 10721 && item.UserOrgId != 10138 && item.UserOrgId != 10278 && item.UserOrgId != 10724 && item.UserOrgId != 10571 && item.UserOrgId != 10731 && item.UserOrgId != 10610 {
 											service.DrugsDelivery(item.UserOrgId, item.ExecutionStaff, &item)
 										}
 

controllers/patient_api_controller.go

@@ -9146,8 +9146,11 @@ func (this *PatientApiController) GetInspectionByProjectId() {
 
 	inspection, _ := service.GetNewInspectionByProjectId(patient_id, project_id, inspect_date, orgId)
 
+	referenceList, _ := service.GetNewInspectionRefence(orgId, project_id)
+
 	this.ServeSuccessJSON(map[string]interface{}{
-		"inspection": inspection,
+		"inspection":    inspection,
+		"referenceList": referenceList,
 	})
 }
 
@@ -9353,6 +9356,8 @@ func (this *PatientApiController) CheckPatientCount() {
 
 	id, _ := this.GetInt64("id")
 
+	patient_id, _ := this.GetInt64("patient_id")
+
 	db := service.XTWriteDB()
 	// 开始外部循环的事务
 	tx := db.Begin()
@@ -9371,8 +9376,9 @@ func (this *PatientApiController) CheckPatientCount() {
 	warehouseInfo, _ := service.GetPatientCountById(id, tx)
 
 	if warehouseInfo.ID > 0 {
-		service.ModiftyPatientCount(warehouseInfo.Count, warehouseInfo.IsType, warehouseInfo.PatientId, tx)
-		patient, _ := service.GetSfPatientById(tx, warehouseInfo.PatientId)
+
+		service.ModiftyPatientCount(warehouseInfo.Count, warehouseInfo.IsType, patient_id, tx)
+		patient, _ := service.GetSfPatientById(tx, patient_id)
 
 		var over_count int64
 		if warehouseInfo.IsType == 1 {
@@ -9396,7 +9402,7 @@ func (this *PatientApiController) CheckPatientCount() {
 			Count:           warehouseInfo.Count,
 			ModeId:          warehouseInfo.IsType,
 			IsType:          1,
-			PatientId:       warehouseInfo.PatientId,
+			PatientId:       patient_id,
 			Status:          1,
 			Ctime:           time.Now().Unix(),
 			Mtime:           time.Now().Unix(),
@@ -9409,7 +9415,7 @@ func (this *PatientApiController) CheckPatientCount() {
 	}
 
 	checkpatientcount, _ := service.CheckPatientCount(id, tx)
-
+	fmt.Println("checkpatientcount----------------", checkpatientcount)
 	tx.Commit()
 
 	this.ServeSuccessJSON(map[string]interface{}{

controllers/stock_in_api_controller.go

@@ -8217,7 +8217,7 @@ func (this *StockManagerApiController) UpdateBaseDrugListByUserOrgID() {
 	//	service.UpdateDealerManufacturerOne(item.ID, manufacturer.ManufacturerName)
 	//}
 
-	drugList, _ := service.GetAllBaseDrugListTwentyOne(10726)
+	drugList, _ := service.GetAllBaseDrugListTwentyOne(10265)
 
 	for _, item := range drugList {
 		var drug_spec = item.Dose + item.DoseUnit + "*" + strconv.FormatInt(item.MinNumber, 10) + item.MinUnit + "/" + item.MaxUnit

models/device_models.go

@@ -317,6 +317,8 @@ type DeviceAddmachers struct {
 	EquimentId          int64  `gorm:"column:equiment_id" json:"equiment_id" form:"equiment_id"`
 	HomeAddress         string `gorm:"column:home_address" json:"home_address" form:"home_address"`
 	HomeSetting         string `gorm:"column:home_setting" json:"home_setting" form:"home_setting"`
+	HomeType            string `gorm:"column:home_type" json:"home_type" form:"home_type"`
+	HomeBigType         string `gorm:"column:home_big_type" json:"home_big_type" form:"home_big_type"`
 }
 
 type DeviceAddmacher struct {
@@ -353,6 +355,8 @@ type DeviceAddmacher struct {
 	BedId               int64  `gorm:"column:bed_id" json:"bed_id" form:"bed_id"`
 	HomeAddress         string `gorm:"column:home_address" json:"home_address" form:"home_address"`
 	HomeSetting         string `gorm:"column:home_setting" json:"home_setting" form:"home_setting"`
+	HomeType            string `gorm:"column:home_type" json:"home_type" form:"home_type"`
+	HomeBigType         string `gorm:"column:home_big_type" json:"home_big_type" form:"home_big_type"`
 }
 
 func (DeviceAddmacher) TableName() string {

service/device_service.go

@@ -725,7 +725,7 @@ func GetMachineDetail(id int64, orgid int64) (models.DeviceAddmachers, error) {
 	db := readUserDb.Table("xt_device_addmacher as a").Where("a.status =1")
 	d := readUserDb.Table("xt_device_mode as d")
 	fmt.Print("d", d)
-	err := db.Select("a.id,a.serial_number,a.device_type,a.bed_number,a.device_name,a.manufacture_factory,a.service_manufacturer,a.unit_type as device_mode,a.use_section,a.section_number,a.buy_date,a.install_date,a.start_date,a.maintenace_engineer,a.telephone,a.guarantee_date,a.machine_status,a.user_total,a.disinfection_mode,a.remarks,a.rubbish_date,a.rubbish_reason,a.user_year,a.work_time,a.revers_mode,a.user_org_id,a.status,a.ctime,a.mtime,a.zone_id,a.bed_id,a.home_address,a.home_setting").Joins("left join xt_device_mode as d on d.id = a.unit_type ").Where("a.id = ? and a.user_org_id = ?", id, orgid).Find(&addmacher).Error
+	err := db.Select("a.id,a.serial_number,a.device_type,a.bed_number,a.device_name,a.manufacture_factory,a.service_manufacturer,a.unit_type as device_mode,a.use_section,a.section_number,a.buy_date,a.install_date,a.start_date,a.maintenace_engineer,a.telephone,a.guarantee_date,a.machine_status,a.user_total,a.disinfection_mode,a.remarks,a.rubbish_date,a.rubbish_reason,a.user_year,a.work_time,a.revers_mode,a.user_org_id,a.status,a.ctime,a.mtime,a.zone_id,a.bed_id,a.home_address,a.home_setting,a.home_type,a.home_big_type").Joins("left join xt_device_mode as d on d.id = a.unit_type ").Where("a.id = ? and a.user_org_id = ?", id, orgid).Find(&addmacher).Error
 	return addmacher, err
 }
 

service/manage_service.go

@@ -54,7 +54,7 @@ func CreateMacher(machers *models.DeviceAddmacher) error {
 
 func UpdateMachine(id int64, orgid int64, addmacher *models.DeviceAddmacher) error {
 
-	err := writeUserDb.Model(&addmacher).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Updates(map[string]interface{}{"serial_number": addmacher.SerialNumber, "device_type": addmacher.DeviceType, "bed_number": addmacher.BedNumber, "device_name": addmacher.DeviceName, "manufacture_factory": addmacher.ManufactureFactory, "service_manufacturer": addmacher.ServiceManufacturer, "unit_type": addmacher.UnitType, "use_section": addmacher.UseSection, "section_number": addmacher.SectionNumber, "buy_date": addmacher.BuyDate, "install_date": addmacher.InstallDate, "start_date": addmacher.StartDate, "maintenace_engineer": addmacher.MaintenaceEngineer, "telephone": addmacher.Telephone, "guarantee_date": addmacher.GuaranteeDate, "machine_status": addmacher.MachineStatus, "user_total": addmacher.UserTotal, "remarks": addmacher.Remarks, "rubbish_date": addmacher.RubbishDate, "rubbish_reason": addmacher.RubbishReason, "user_year": addmacher.UserYear, "work_time": addmacher.WorkTime, "bed_id": addmacher.BedId, "disinfection_mode": addmacher.DisinfectionMode, "revers_mode": addmacher.ReversMode, "mtime": time.Now().Unix(), "zone_id": addmacher.ZoneId, "home_address": addmacher.HomeAddress, "home_setting": addmacher.HomeSetting}).Error
+	err := writeUserDb.Model(&addmacher).Where("id = ? AND user_org_id = ? AND status = ?", id, orgid, 1).Updates(map[string]interface{}{"serial_number": addmacher.SerialNumber, "device_type": addmacher.DeviceType, "bed_number": addmacher.BedNumber, "device_name": addmacher.DeviceName, "manufacture_factory": addmacher.ManufactureFactory, "service_manufacturer": addmacher.ServiceManufacturer, "unit_type": addmacher.UnitType, "use_section": addmacher.UseSection, "section_number": addmacher.SectionNumber, "buy_date": addmacher.BuyDate, "install_date": addmacher.InstallDate, "start_date": addmacher.StartDate, "maintenace_engineer": addmacher.MaintenaceEngineer, "telephone": addmacher.Telephone, "guarantee_date": addmacher.GuaranteeDate, "machine_status": addmacher.MachineStatus, "user_total": addmacher.UserTotal, "remarks": addmacher.Remarks, "rubbish_date": addmacher.RubbishDate, "rubbish_reason": addmacher.RubbishReason, "user_year": addmacher.UserYear, "work_time": addmacher.WorkTime, "bed_id": addmacher.BedId, "disinfection_mode": addmacher.DisinfectionMode, "revers_mode": addmacher.ReversMode, "mtime": time.Now().Unix(), "zone_id": addmacher.ZoneId, "home_address": addmacher.HomeAddress, "home_setting": addmacher.HomeSetting, "home_type": addmacher.HomeType, "home_big_type": addmacher.HomeBigType}).Error
 
 	return err
 

service/patient_service.go

@@ -5051,6 +5051,13 @@ func GetNewInspectionByProjectId(patient_id int64, project_id int64, inspect_dat
 	return inspection, err
 }
 
+func GetNewInspectionRefence(org_id int64, project_id int64) (reference []*models.XtInspectionReference, err error) {
+
+	err = XTReadDB().Where("(org_id = ? or org_id = 0) and project_id = ?", org_id, project_id).Find(&reference).Error
+
+	return reference, err
+}
+
 func GetSelfDrugOutInfo(patient_id int64, sys_record_time int64, drug_id int64) (outInfo []*models.XtSelfDrugWarehouseOutInfo, err error) {
 
 	err = XTReadDB().Where("patient_id = ? and sys_record_time = ? and drug_id = ? and status=1", patient_id, sys_record_time, drug_id).Find(&outInfo).Error
@@ -5280,7 +5287,7 @@ func GetPatientCountById(id int64, tx *gorm.DB) (models.SfPatientInCount, error)
 
 	patientInCount := models.SfPatientInCount{}
 
-	err := tx.Where("id = ?", id).Find(&patientInCount).Error
+	err := tx.Where("id = ? and status=1", id).Find(&patientInCount).Error
 	if err != nil {
 		tx.Rollback()
 		return patientInCount, err

service/user_service.go

@@ -100,7 +100,7 @@ func GetAllAdminUsersTwo(orgId int64) (list []*AdminUserList, err error) {
 
 	err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
 
-	if orgId == 10724 {
+	if orgId == 10724 || orgId == 10653 {
 		err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.org_id=?", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error
 	} else {
 		err = readUserDb.Table("sgj_user_admin_role as uar").Joins("JOIN sgj_user_admin as ua ON ua.id = uar.admin_user_id").Where("uar.status=1 and uar.org_id=?  and ua.status=1", orgId).Select("ua.id, uar.user_name as name, uar.user_type,uar.status").Scan(&list).Error