|
@@ -555,6 +555,13 @@ func (this *NewDialysisApiController) SavePatient() {
|
555
|
555
|
}
|
556
|
556
|
|
557
|
557
|
func (this *NewDialysisApiController) GetPatientDetail() {
|
|
558
|
+ nowDateTime := time.Now()
|
|
559
|
+ nowDate := nowDateTime.Format("2006-01-02")
|
|
560
|
+ nowDate += " 00:00:00"
|
|
561
|
+ timeLayout := "2006-01-02"
|
|
562
|
+ loc, _ := time.LoadLocation("Local")
|
|
563
|
+ theTime, _ := time.ParseInLocation(timeLayout+" 15:04:05", nowDate, loc)
|
|
564
|
+ nowdate := theTime.Unix()
|
558
|
565
|
id, _ := this.GetInt64("id")
|
559
|
566
|
//获取病人详情信息
|
560
|
567
|
detail, err := service.GetPatientDetailTwo(id)
|
|
@@ -574,6 +581,7 @@ func (this *NewDialysisApiController) GetPatientDetail() {
|
574
|
581
|
"diseases": diseases,
|
575
|
582
|
"slowDiseases": slowDiseases,
|
576
|
583
|
"cronicDiseases": cronicDiseases,
|
|
584
|
+ "nowdate": nowdate,
|
577
|
585
|
})
|
578
|
586
|
}
|
579
|
587
|
|
|
@@ -1837,21 +1845,28 @@ func (this *NewDialysisApiController) SavePartition() {
|
1837
|
1845
|
fmt.Println("分区型号", zonetype)
|
1838
|
1846
|
strInt64 := strconv.FormatInt(zonetype, 10)
|
1839
|
1847
|
typeid, _ := strconv.Atoi(strInt64)
|
1840
|
|
- zone := models.DeviceZone{
|
1841
|
|
- Name: name,
|
1842
|
|
- Type: typeid,
|
1843
|
|
- OrgID: adminInfo.Org.Id,
|
1844
|
|
- Status: 1,
|
1845
|
|
- CreateTime: time.Now().Unix(),
|
1846
|
|
- }
|
1847
|
|
- err := service.CreatedZone(&zone)
|
1848
|
|
- if err != nil {
|
|
1848
|
+ _, errcode := service.GetPartitionByName(name, adminInfo.Org.Id)
|
|
1849
|
+ fmt.Println("errcode-------", errcode)
|
|
1850
|
+ if errcode == gorm.ErrRecordNotFound {
|
|
1851
|
+ zone := models.DeviceZone{
|
|
1852
|
+ Name: name,
|
|
1853
|
+ Type: typeid,
|
|
1854
|
+ OrgID: adminInfo.Org.Id,
|
|
1855
|
+ Status: 1,
|
|
1856
|
+ CreateTime: time.Now().Unix(),
|
|
1857
|
+ }
|
|
1858
|
+ err := service.CreatedZone(&zone)
|
|
1859
|
+ if err != nil {
|
|
1860
|
+ this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
|
1861
|
+ return
|
|
1862
|
+ }
|
|
1863
|
+ this.ServeSuccessJSON(map[string]interface{}{
|
|
1864
|
+ "zone": zone,
|
|
1865
|
+ })
|
|
1866
|
+ } else if errcode == nil {
|
1849
|
1867
|
this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
1850
|
1868
|
return
|
1851
|
1869
|
}
|
1852
|
|
- this.ServeSuccessJSON(map[string]interface{}{
|
1853
|
|
- "zone": zone,
|
1854
|
|
- })
|
1855
|
1870
|
}
|
1856
|
1871
|
|
1857
|
1872
|
func (this *NewDialysisApiController) GetAllZone() {
|
|
@@ -1886,20 +1901,27 @@ func (this *NewDialysisApiController) SaveGroup() {
|
1886
|
1901
|
orgid := adminUser.Org.Id
|
1887
|
1902
|
name := this.GetString("name")
|
1888
|
1903
|
fmt.Println("name", name)
|
1889
|
|
- group := models.DeviceGroup{
|
1890
|
|
- Name: name,
|
1891
|
|
- Status: 1,
|
1892
|
|
- CreateTime: time.Now().Unix(),
|
1893
|
|
- OrgID: orgid,
|
1894
|
|
- }
|
1895
|
|
- err := service.SaveGroup(&group)
|
1896
|
|
- if err != nil {
|
|
1904
|
+ _, errcode := service.GetGroupByName(name, orgid)
|
|
1905
|
+ if errcode == gorm.ErrRecordNotFound {
|
|
1906
|
+ group := models.DeviceGroup{
|
|
1907
|
+ Name: name,
|
|
1908
|
+ Status: 1,
|
|
1909
|
+ CreateTime: time.Now().Unix(),
|
|
1910
|
+ OrgID: orgid,
|
|
1911
|
+ }
|
|
1912
|
+ err := service.SaveGroup(&group)
|
|
1913
|
+ if err != nil {
|
|
1914
|
+ this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
|
1915
|
+ return
|
|
1916
|
+ }
|
|
1917
|
+ this.ServeSuccessJSON(map[string]interface{}{
|
|
1918
|
+ "group": group,
|
|
1919
|
+ })
|
|
1920
|
+ } else if errcode == nil {
|
1897
|
1921
|
this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
1898
|
1922
|
return
|
1899
|
1923
|
}
|
1900
|
|
- this.ServeSuccessJSON(map[string]interface{}{
|
1901
|
|
- "group": group,
|
1902
|
|
- })
|
|
1924
|
+
|
1903
|
1925
|
}
|
1904
|
1926
|
|
1905
|
1927
|
func (this *NewDialysisApiController) GetAllGroup() {
|
|
@@ -1955,22 +1977,29 @@ func (this *NewDialysisApiController) SaveBed() {
|
1955
|
1977
|
fmt.Print("zone", zone)
|
1956
|
1978
|
group, _ := this.GetInt64("group")
|
1957
|
1979
|
fmt.Println("group", group)
|
1958
|
|
- number := models.DeviceNumber{
|
1959
|
|
- Number: name,
|
1960
|
|
- ZoneID: zone,
|
1961
|
|
- GroupID: group,
|
1962
|
|
- OrgID: orgid,
|
1963
|
|
- Status: 1,
|
1964
|
|
- CreateTime: time.Now().Unix(),
|
1965
|
|
- }
|
1966
|
|
- err := service.CreateNumber(&number)
|
1967
|
|
- if err != nil {
|
|
1980
|
+ _, errcode := service.GetBedByName(name, orgid)
|
|
1981
|
+ if errcode == gorm.ErrRecordNotFound {
|
|
1982
|
+ number := models.DeviceNumber{
|
|
1983
|
+ Number: name,
|
|
1984
|
+ ZoneID: zone,
|
|
1985
|
+ GroupID: group,
|
|
1986
|
+ OrgID: orgid,
|
|
1987
|
+ Status: 1,
|
|
1988
|
+ CreateTime: time.Now().Unix(),
|
|
1989
|
+ }
|
|
1990
|
+ err := service.CreateNumber(&number)
|
|
1991
|
+ if err != nil {
|
|
1992
|
+ this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
|
1993
|
+ return
|
|
1994
|
+ }
|
|
1995
|
+ this.ServeSuccessJSON(map[string]interface{}{
|
|
1996
|
+ "number": number,
|
|
1997
|
+ })
|
|
1998
|
+ } else if errcode == nil {
|
1968
|
1999
|
this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
1969
|
2000
|
return
|
1970
|
2001
|
}
|
1971
|
|
- this.ServeSuccessJSON(map[string]interface{}{
|
1972
|
|
- "number": number,
|
1973
|
|
- })
|
|
2002
|
+
|
1974
|
2003
|
}
|
1975
|
2004
|
|
1976
|
2005
|
func (this *NewDialysisApiController) GetAllNumber() {
|
|
@@ -2278,11 +2307,18 @@ func (this *NewDialysisApiController) GetPartionDetail() {
|
2278
|
2307
|
}
|
2279
|
2308
|
|
2280
|
2309
|
func (this *NewDialysisApiController) UpdatePartition() {
|
|
2310
|
+ adminUser := this.GetMobileAdminUserInfo()
|
|
2311
|
+ orgid := adminUser.Org.Id
|
2281
|
2312
|
id, _ := this.GetInt64("id")
|
2282
|
2313
|
name := this.GetString("name")
|
2283
|
2314
|
zoneType, _ := this.GetInt64("type")
|
2284
|
2315
|
strInt64 := strconv.FormatInt(zoneType, 10)
|
2285
|
2316
|
typeid, _ := strconv.Atoi(strInt64)
|
|
2317
|
+ byName, _ := service.GetPartitionByNameOne(name, orgid)
|
|
2318
|
+ if byName.ID > 0 && byName.ID != id {
|
|
2319
|
+ this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
|
|
2320
|
+ return
|
|
2321
|
+ }
|
2286
|
2322
|
zone := models.DeviceZone{
|
2287
|
2323
|
Name: name,
|
2288
|
2324
|
Type: typeid,
|
|
@@ -2311,8 +2347,14 @@ func (this *NewDialysisApiController) GetGroupDetail() {
|
2311
|
2347
|
}
|
2312
|
2348
|
|
2313
|
2349
|
func (this *NewDialysisApiController) UpdateGroup() {
|
|
2350
|
+ adminUser := this.GetMobileAdminUserInfo()
|
|
2351
|
+ orgid := adminUser.Org.Id
|
2314
|
2352
|
id, _ := this.GetInt64("id")
|
2315
|
2353
|
name := this.GetString("name")
|
|
2354
|
+ byName, _ := service.GetGroupByNameOne(name, orgid)
|
|
2355
|
+ if byName.ID > 0 && byName.ID != id {
|
|
2356
|
+ return
|
|
2357
|
+ }
|
2316
|
2358
|
group := models.DeviceGroup{Name: name}
|
2317
|
2359
|
err := service.UpdateGroup(id, &group)
|
2318
|
2360
|
if err != nil {
|
|
@@ -2343,6 +2385,8 @@ func (this *NewDialysisApiController) GetBedDetail() {
|
2343
|
2385
|
}
|
2344
|
2386
|
|
2345
|
2387
|
func (this *NewDialysisApiController) UpdatedBed() {
|
|
2388
|
+ adminUser := this.GetMobileAdminUserInfo()
|
|
2389
|
+ orgId := adminUser.Org.Id
|
2346
|
2390
|
id, _ := this.GetInt64("id")
|
2347
|
2391
|
name := this.GetString("name")
|
2348
|
2392
|
fmt.Println("name", name)
|
|
@@ -2350,6 +2394,11 @@ func (this *NewDialysisApiController) UpdatedBed() {
|
2350
|
2394
|
fmt.Println("zone", zone)
|
2351
|
2395
|
group, _ := this.GetInt64("group")
|
2352
|
2396
|
fmt.Println("group", group)
|
|
2397
|
+ BedName, _ := service.GetBedByNameOne(name, orgId)
|
|
2398
|
+ fmt.Println("-----", BedName.ID)
|
|
2399
|
+ if BedName.ID > 0 && BedName.ID != id {
|
|
2400
|
+ return
|
|
2401
|
+ }
|
2353
|
2402
|
number := models.DeviceNumber{
|
2354
|
2403
|
Number: name,
|
2355
|
2404
|
ZoneID: zone,
|