|
|
@@ -153,15 +153,15 @@ func QueryPlan(orgid int64, devicetype int64, ids []int64, classids []int64, equ
|
|
153
|
153
|
return &pre, nil
|
|
154
|
154
|
}
|
|
155
|
155
|
|
|
156
|
|
-func AddPlan(orgid int64, deviceType int64, disinfecTime string, ids []int64, classids []int64, way int64, machinedisinfectant int64, disinfectantway int64, disinfectant int64, equimentid int64, bedid int64) (err error) {
|
|
|
156
|
+func AddPlan(orgid int64, deviceType int64, disinfecTime string, ids []int64, classids []int64, way int64, machinedisinfectant int64, disinfectantway int64, disinfectant int64, equimentid int64, bedid int64, bed_way int64) (err error) {
|
|
157
|
157
|
xt := UserWriteDB().Begin()
|
|
158
|
158
|
if len(ids) > 0 {
|
|
159
|
|
- thisSQL := "INSERT INTO xt_device_plan(device_type,disinfec_time,time,classtime,way,machine_disinfectant,disinfectan_way,disinfectant,status,ctime,user_org_id,equiment_id,bed_id) VALUES "
|
|
|
159
|
+ thisSQL := "INSERT INTO xt_device_plan(device_type,disinfec_time,time,classtime,way,machine_disinfectant,disinfectan_way,disinfectant,status,ctime,user_org_id,equiment_id,bed_id,bed_way) VALUES "
|
|
160
|
160
|
insertParams := make([]string, 0)
|
|
161
|
161
|
insertData := make([]interface{}, 0)
|
|
162
|
162
|
for _, id := range ids {
|
|
163
|
163
|
for _, classids := range classids {
|
|
164
|
|
- insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?)")
|
|
|
164
|
+ insertParams = append(insertParams, "(?,?,?,?,?,?,?,?,?,?,?,?,?,?)")
|
|
165
|
165
|
insertData = append(insertData, deviceType)
|
|
166
|
166
|
insertData = append(insertData, disinfecTime)
|
|
167
|
167
|
insertData = append(insertData, id)
|
|
|
@@ -175,6 +175,7 @@ func AddPlan(orgid int64, deviceType int64, disinfecTime string, ids []int64, cl
|
|
175
|
175
|
insertData = append(insertData, orgid)
|
|
176
|
176
|
insertData = append(insertData, equimentid)
|
|
177
|
177
|
insertData = append(insertData, bedid)
|
|
|
178
|
+ insertData = append(insertData, bed_way)
|
|
178
|
179
|
}
|
|
179
|
180
|
}
|
|
180
|
181
|
thisSQL += strings.Join(insertParams, ",")
|
|
|
@@ -199,7 +200,7 @@ func GetAllPlan(orgid int64) (plan []*models.DevicePlans, err error) {
|
|
199
|
200
|
// //err = db.Select("p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,e.unit_type").Group("p.id").Joins("Left JOIN xt_device_addmacher as e On e.id = p.device_type").Order("e.unit_type asc,p.time").Scan(&plan).Error
|
|
200
|
201
|
// //return plan, err
|
|
201
|
202
|
|
|
202
|
|
- err = readUserDb.Raw("select DISTINCT p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,p.equiment_id,p.bed_id,e.device_mode from xt_device_plan as p left join xt_device_mode as e On e.id = p.device_type where p.user_org_id = ? and p.status = 1", orgid).Order("e.device_mode asc,p.time").Scan(&plan).Error
|
|
|
203
|
+ err = readUserDb.Raw("select DISTINCT p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,p.equiment_id,p.bed_id,e.device_mode,p.bed_way from xt_device_plan as p left join xt_device_mode as e On e.id = p.device_type where p.user_org_id = ? and p.status = 1", orgid).Order("e.device_mode asc,p.time").Scan(&plan).Error
|
|
203
|
204
|
return plan, err
|
|
204
|
205
|
}
|
|
205
|
206
|
|
|
|
@@ -221,7 +222,7 @@ func GetAllPlanDetail(id int64, orgid int64) (plan []*models.DevicePlans, err er
|
|
221
|
222
|
//}
|
|
222
|
223
|
//err = db.Select("p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,e.unit_type").Group("p.id").Joins("Left JOIN xt_device_addmacher as e On e.id = p.equiment_id").Order("p.time asc").Scan(&plan).Error
|
|
223
|
224
|
//return plan, err
|
|
224
|
|
- err = readUserDb.Raw("select DISTINCT p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,p.equiment_id,p.bed_id,e.device_mode from xt_device_plan as p left join xt_device_mode as e On e.id = p.device_type where p.user_org_id = ? and p.device_type = ? and p.status = 1", orgid, id).Order("p.time asc,p.classtime asc").Scan(&plan).Error
|
|
|
225
|
+ err = readUserDb.Raw("select DISTINCT p.id,p.device_type,p.disinfec_time,p.time,p.classtime,p.way,p.machine_disinfectant,p.disinfectan_way,p.disinfectant,p.equiment_id,p.bed_id,e.device_mode,p.bed_way from xt_device_plan as p left join xt_device_mode as e On e.id = p.device_type where p.user_org_id = ? and p.device_type = ? and p.status = 1", orgid, id).Order("p.time asc,p.classtime asc").Scan(&plan).Error
|
|
225
|
226
|
return plan, err
|
|
226
|
227
|
}
|
|
227
|
228
|
|
|
|
@@ -889,7 +890,7 @@ func GetTotalNumber(id int64, orgid int64) (total int64, err error) {
|
|
889
|
890
|
}
|
|
890
|
891
|
|
|
891
|
892
|
func GetTimeWarning(equitid int64, orgId int64) (models.DeviceInformation, error) {
|
|
892
|
|
- //fmt.Print("equitid是什么码字--------------------------------------------------------------------",equitid)
|
|
|
893
|
+
|
|
893
|
894
|
information := models.DeviceInformation{}
|
|
894
|
895
|
err = UserReadDB().Where(" user_org_id = ? AND status = 1 AND equiment_id = ? AND (dialysis_checked = 1 or dialysis_checked = 0)", orgId, equitid).Last(&information).Error
|
|
895
|
896
|
return information, err
|
|
|
@@ -933,6 +934,15 @@ func GetInformation(eid int64, startdate int64, orgid int64, classtype int64) (*
|
|
933
|
934
|
return &information, nil
|
|
934
|
935
|
}
|
|
935
|
936
|
|
|
|
937
|
+func GetLastInformationById(eid int64, orgid int64) (models.DeviceInformation, error) {
|
|
|
938
|
+
|
|
|
939
|
+ information := models.DeviceInformation{}
|
|
|
940
|
+
|
|
|
941
|
+ err := UserReadDB().Model(&information).Where("equiment_id = ? and user_org_id = ? and status = 1", eid, orgid).Last(&information).Error
|
|
|
942
|
+
|
|
|
943
|
+ return information, err
|
|
|
944
|
+}
|
|
|
945
|
+
|
|
936
|
946
|
func ChangeBed(id int64, org int64) (number []*models.DeviceNumber, err error) {
|
|
937
|
947
|
|
|
938
|
948
|
err = XTReadDB().Model(&number).Where("zone_id = ? AND status = 1 AND org_id = ? ", id, org).Find(&number).Error
|
|
|
@@ -1563,3 +1573,159 @@ func DeleteDevicePh(id int64) error {
|
|
1563
|
1573
|
err := writeUserDb.Model(&ph).Where("id = ? ", id).Updates(map[string]interface{}{"status": 0}).Error
|
|
1564
|
1574
|
return err
|
|
1565
|
1575
|
}
|
|
|
1576
|
+
|
|
|
1577
|
+func CretaDeviceWater(water models.XtDialysisDeviceWater) error {
|
|
|
1578
|
+
|
|
|
1579
|
+ err := XTWriteDB().Create(&water).Error
|
|
|
1580
|
+
|
|
|
1581
|
+ return err
|
|
|
1582
|
+}
|
|
|
1583
|
+
|
|
|
1584
|
+func SaveDeviceWater(water models.XtDialysisDeviceWater) error {
|
|
|
1585
|
+
|
|
|
1586
|
+ err := XTWriteDB().Save(&water).Error
|
|
|
1587
|
+
|
|
|
1588
|
+ return err
|
|
|
1589
|
+}
|
|
|
1590
|
+
|
|
|
1591
|
+func GetWaterFormList(equitment_id, start_timeunix, endtimeunix, limit, page, orgId int64) (water []*models.XtDialysisDeviceWater, total int64, err error) {
|
|
|
1592
|
+
|
|
|
1593
|
+ offset := (page - 1) * limit
|
|
|
1594
|
+
|
|
|
1595
|
+ db := XTReadDB().Model(&water).Where("status =1")
|
|
|
1596
|
+ if equitment_id > 0 {
|
|
|
1597
|
+ db = db.Where("equiment_id= ?", equitment_id)
|
|
|
1598
|
+ }
|
|
|
1599
|
+ if start_timeunix > 0 {
|
|
|
1600
|
+ db = db.Where("record_date>=?", start_timeunix)
|
|
|
1601
|
+ }
|
|
|
1602
|
+ if endtimeunix > 0 {
|
|
|
1603
|
+ db = db.Where("record_date<=?", endtimeunix)
|
|
|
1604
|
+ }
|
|
|
1605
|
+ if orgId > 0 {
|
|
|
1606
|
+ db = db.Where("user_org_id = ?", orgId)
|
|
|
1607
|
+ }
|
|
|
1608
|
+ err = db.Count(&total).Limit(limit).Offset(offset).Order("record_date desc").Find(&water).Error
|
|
|
1609
|
+
|
|
|
1610
|
+ return water, total, err
|
|
|
1611
|
+}
|
|
|
1612
|
+
|
|
|
1613
|
+func DelelteDialysisWater(id int64) error {
|
|
|
1614
|
+
|
|
|
1615
|
+ err := XTWriteDB().Model(&models.XtDialysisDeviceWater{}).Where("id = ? and status =1", id).Updates(map[string]interface{}{"status": 0}).Error
|
|
|
1616
|
+
|
|
|
1617
|
+ return err
|
|
|
1618
|
+}
|
|
|
1619
|
+
|
|
|
1620
|
+func GetDialysisWaterDetail(id int64) (models.XtDialysisDeviceWater, error) {
|
|
|
1621
|
+
|
|
|
1622
|
+ water := models.XtDialysisDeviceWater{}
|
|
|
1623
|
+
|
|
|
1624
|
+ err := XTReadDB().Where("id = ? and status = 1", id).Find(&water).Error
|
|
|
1625
|
+
|
|
|
1626
|
+ return water, err
|
|
|
1627
|
+}
|
|
|
1628
|
+
|
|
|
1629
|
+func DeleteBatchDialysisWater(orgid int64, ids []int64) (err error) {
|
|
|
1630
|
+ if len(ids) == 1 {
|
|
|
1631
|
+ err = XTWriteDB().Model(&models.XtDialysisDeviceWater{}).Where("id=? and user_org_id = ?", ids[0], orgid).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
|
|
|
1632
|
+ } else {
|
|
|
1633
|
+ err = XTWriteDB().Model(models.XtDialysisDeviceWater{}).Where("id IN(?) and user_org_id = ?", ids, orgid).Updates(map[string]interface{}{"status": 0, "mtime": time.Now().Unix()}).Error
|
|
|
1634
|
+ }
|
|
|
1635
|
+
|
|
|
1636
|
+ return
|
|
|
1637
|
+}
|
|
|
1638
|
+
|
|
|
1639
|
+func CreateNewAirDisinfect(disinfect models.XtNewAriDisinfect) error {
|
|
|
1640
|
+
|
|
|
1641
|
+ err := XTWriteDB().Create(&disinfect).Error
|
|
|
1642
|
+
|
|
|
1643
|
+ return err
|
|
|
1644
|
+}
|
|
|
1645
|
+
|
|
|
1646
|
+func GetNewAirDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtNewAriDisinfect, total int64, err error) {
|
|
|
1647
|
+
|
|
|
1648
|
+ offset := (page - 1) * limit
|
|
|
1649
|
+
|
|
|
1650
|
+ db := XTReadDB().Model(&list).Where("status =1")
|
|
|
1651
|
+ if start_time > 0 {
|
|
|
1652
|
+ db = db.Where("record_date >= ?", start_time)
|
|
|
1653
|
+ }
|
|
|
1654
|
+ if end_time > 0 {
|
|
|
1655
|
+ db = db.Where("record_date <= ?", end_time)
|
|
|
1656
|
+ }
|
|
|
1657
|
+ if user_org_id > 0 {
|
|
|
1658
|
+ db = db.Where("user_org_id = ?", user_org_id)
|
|
|
1659
|
+ }
|
|
|
1660
|
+ err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
|
|
|
1661
|
+ return list, total, err
|
|
|
1662
|
+}
|
|
|
1663
|
+
|
|
|
1664
|
+func GetNewAirDisinfectByIdList(id int64) (models.XtNewAriDisinfect, error) {
|
|
|
1665
|
+
|
|
|
1666
|
+ disinfect := models.XtNewAriDisinfect{}
|
|
|
1667
|
+
|
|
|
1668
|
+ err := XTReadDB().Where("id = ? and status= 1", id).Find(&disinfect).Error
|
|
|
1669
|
+
|
|
|
1670
|
+ return disinfect, err
|
|
|
1671
|
+}
|
|
|
1672
|
+
|
|
|
1673
|
+func SaveNewAriDisinfect(disinfect models.XtNewAriDisinfect) error {
|
|
|
1674
|
+
|
|
|
1675
|
+ err := XTWriteDB().Save(&disinfect).Error
|
|
|
1676
|
+ return err
|
|
|
1677
|
+}
|
|
|
1678
|
+
|
|
|
1679
|
+func DeleteNewAirDisInfect(id int64) error {
|
|
|
1680
|
+
|
|
|
1681
|
+ err := XTWriteDB().Model(&models.XtNewAriDisinfect{}).Where("id= ? and status = 1", id).Updates(map[string]interface{}{"status": 0}).Error
|
|
|
1682
|
+
|
|
|
1683
|
+ return err
|
|
|
1684
|
+}
|
|
|
1685
|
+
|
|
|
1686
|
+func CreateObjectDisInfect(disinfect models.XtNewObjectDisinfect) error {
|
|
|
1687
|
+
|
|
|
1688
|
+ err := XTWriteDB().Create(&disinfect).Error
|
|
|
1689
|
+
|
|
|
1690
|
+ return err
|
|
|
1691
|
+}
|
|
|
1692
|
+
|
|
|
1693
|
+func GetObjectTableDisinfectList(limit int64, page int64, start_time int64, end_time int64, user_org_id int64) (list []*models.XtNewObjectDisinfect, total int64, err error) {
|
|
|
1694
|
+
|
|
|
1695
|
+ offset := (page - 1) * limit
|
|
|
1696
|
+
|
|
|
1697
|
+ db := XTReadDB().Model(&list).Where("status =1")
|
|
|
1698
|
+ if start_time > 0 {
|
|
|
1699
|
+ db = db.Where("record_date >= ?", start_time)
|
|
|
1700
|
+ }
|
|
|
1701
|
+ if end_time > 0 {
|
|
|
1702
|
+ db = db.Where("record_date <= ?", end_time)
|
|
|
1703
|
+ }
|
|
|
1704
|
+ if user_org_id > 0 {
|
|
|
1705
|
+ db = db.Where("user_org_id = ?", user_org_id)
|
|
|
1706
|
+ }
|
|
|
1707
|
+ err = db.Count(&total).Offset(offset).Limit(limit).Find(&list).Error
|
|
|
1708
|
+ return list, total, err
|
|
|
1709
|
+}
|
|
|
1710
|
+
|
|
|
1711
|
+func GetObjectTableDisinfectByList(id int64) (models.XtNewObjectDisinfect, error) {
|
|
|
1712
|
+
|
|
|
1713
|
+ disinfect := models.XtNewObjectDisinfect{}
|
|
|
1714
|
+
|
|
|
1715
|
+ err := XTReadDB().Where("id=? and status =1", id).Find(&disinfect).Error
|
|
|
1716
|
+
|
|
|
1717
|
+ return disinfect, err
|
|
|
1718
|
+}
|
|
|
1719
|
+
|
|
|
1720
|
+func UpdateObjectTableDisinfect(disinfect models.XtNewObjectDisinfect) error {
|
|
|
1721
|
+
|
|
|
1722
|
+ err := XTWriteDB().Save(&disinfect).Error
|
|
|
1723
|
+
|
|
|
1724
|
+ return err
|
|
|
1725
|
+}
|
|
|
1726
|
+
|
|
|
1727
|
+func DeleteObjectTableDisinfect(id int64) error {
|
|
|
1728
|
+
|
|
|
1729
|
+ err := XTWriteDB().Model(&models.XtNewObjectDisinfect{}).Where("id=? and status= 1", id).Updates(map[string]interface{}{"status": 0}).Error
|
|
|
1730
|
+ return err
|
|
|
1731
|
+}
|
28169