修改检验检查相关

.gitignore

@@ -1,5 +0,0 @@
-.svn
-.git
-XT.ext
-/*.exe
-/*.exe~

conf/app.conf

@@ -1,239 +0,0 @@
-appname = 血透
-httpport = 9531
-runmode = dev
-
-
-copyrequestbody = true
-sessionon = true
-sessiongcmaxlifetime = 64800
-
-tokencookiemaxlifetime = 7200
-enablexsrf = false
-xsrfkey = 61oETzKXQAGaYdkL5gEmGeJJFuYh7EQnp2XdTP1o
-xsrfexpire = 3600
-
-qiniu_accesskey = -l_Pcc1YJs0gh3w0YwN2uoaZO_5fY5J9SIYnSjg0
-qiniu_secretkey = DmZSp_Bmnp-9aUB7xUvoyViZpzmx1Rs2RL69GvlW
-qiniu_domain = https://images.shengws.com/
-qiniu_bucket = syhclub-storage
-
-
-
-aes_key = "xuetou-201807319"
-
-wxtoken = gh_ac6cd0cdde3d
-wxoriId = gh_ac6cd0cdde3d
-wxappId = wxbb9223f20bc11612
-# wxappsecret = a78c793c377268db25dde2eb971a2ebb
-# wxEncodingAESKey = 1vRDzqltXYOc9iMqhsQT7AkIRRpUaGl8MZlUcP7x4UK
-
-sms_appId = dcabb3aa7afd402794046ebbbf652bce
-sms_sid = a26cb0ceb3a811ca82143972f4ef38a4
-sms_token = ea475ed8d3de6c54c2b3f9d78db76d1e
-sms_baseUrl = https://open.ucpaas.com/ol/sms/
-ip_max_send_count = 20
-moblie_max_send_count = 5
-sms_verification_code_templateid = 358429
-
-
-appid = "wx43ad410d9eef426e"
-mchid = "1509573721"
-key = "e4SHrkiZu0pQEwVoGBapDBTf9N1Q6MxV"
-appsecret="61ee2e6268497d5aa9de0b0187c39aea"
-
-
-
-[prod]
-mobile_token_expiration_second = 86400
-httpdomain = https://api.xt.kuyicloud.com
-sso_domain = https://sso.kuyicloud.com
-front_end_domain = "https://xt.kuyicloud.com/#"
-
-readmysqlhost = shengws1.mysql.rds.aliyuncs.com
-readmysqlport = 3306
-readmysqluser = syh
-readmysqlpass = xhPECP2nFObR8aUK
-readmysqlname = sgj_xt
-
-writemysqlhost = shengws1.mysql.rds.aliyuncs.com
-writemysqlport = 3306
-writemysqluser = syh
-writemysqlpass = xhPECP2nFObR8aUK
-writemysqlname = sgj_xt
-
-
-readuserhost = shengws1.mysql.rds.aliyuncs.com
-readuserport = 3306
-readuseruser = syh
-readuserpass = xhPECP2nFObR8aUK
-readusername = sgj_users
-
-writeuserhost = shengws1.mysql.rds.aliyuncs.com
-writeuserport = 3306
-writeuseruser = syh
-writeuserpass = xhPECP2nFObR8aUK
-writeusername = sgj_users
-
-readmiddlehost = shengws1.mysql.rds.aliyuncs.com
-readmiddleport = 3306
-readmiddleuser = syh
-readmiddlepass = xhPECP2nFObR8aUK
-readmiddlename = ky_xt_middle
-
-writemiddlehost = shengws1.mysql.rds.aliyuncs.com
-writemiddleport = 3306
-writemiddleuser = syh
-writemiddlepass = xhPECP2nFObR8aUK
-writemiddlename = ky_xt_middle
-
-
-readsgjpatientmysqlhost = shengws1.mysql.rds.aliyuncs.com
-readsgjpatientmysqlport = 3306
-readsgjpatientmysqluser = syh
-readsgjpatientmysqlpass = xhPECP2nFObR8aUK
-readsgjpatientmysqlname = sgj_patient
-
-writesgjpatientmysqlhost = shengws1.mysql.rds.aliyuncs.com
-writesgjpatientmysqlport = 3306
-writesgjpatientmysqluser = syh
-writesgjpatientmysqlpass = xhPECP2nFObR8aUK
-writesgjpatientmysqlname = sgj_patient
-
-
-readpatienthost = shengws1.mysql.rds.aliyuncs.com
-readpatientport = 3306
-readpatientuser = syh
-readpatientpass = xhPECP2nFObR8aUK
-readpatientname = sgj_cdm
-
-writepatienthost = shengws1.mysql.rds.aliyuncs.com
-writepatientport = 3306
-writepatientuser = syh
-writepatientpass = xhPECP2nFObR8aUK
-writepatientname = sgj_cdm
-
-redishost = 349e580b2a524290.redis.rds.aliyuncs.com
-redisport = 6379
-redispasswrod = TZtBW098WId3i27clkpj3q8dnUaVFP
-redisdb = 0
-
-
-
-
-
-
-niprocart =  63
-jms = 58
-fistula_needle_set = 65
-fistula_needle_set_16 = 64
-hemoperfusion = 55
-dialyser_sterilised = 12
-filtryzer = 53
-dialyzers = 8
-injector = 81
-bloodlines = 42
-tubingHemodialysis = 30
-package = 82
-aliquid = 83
-
-
-
-[dev]
-mobile_token_expiration_second = 3600
-httpdomain = http://api.xt.test.sgjyun.com
-sso_domain = https://testsso.sgjyun.com
-front_end_domain = "http://xt.test.sgjyun.com/#"
-
-readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readmysqlport = 3306
-readmysqluser = root
-readmysqlpass = 1Q2W3e4r!@#$
-readmysqlname = test_xt
-//readmysqlname = sgj_xt
-
-writemysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-writemysqlport = 3306
-writemysqluser = root
-writemysqlpass = 1Q2W3e4r!@#$
-writemysqlname = test_xt
-//writemysqlname = sgj_xt
-
-readuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readuserport = 3306
-readuseruser = root
-readuserpass = 1Q2W3e4r!@#$
-readusername = test_users
-//readusername = sgj_users
-
-writeuserhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-writeuserport = 3306
-writeuseruser = root
-writeuserpass = 1Q2W3e4r!@#$
-writeusername = test_users
-//writeusername = sgj_users
-
-
-readmiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readmiddleport = 3306
-readmiddleuser = root
-readmiddlepass = 1Q2W3e4r!@#$
-readmiddlename = ky_xt_middle
-
-writemiddlehost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-writemiddleport = 3306
-writemiddleuser = root
-writemiddlepass = 1Q2W3e4r!@#$
-writemiddlename = ky_xt_middle
-
-
-
-readpatienthost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readpatientport = 3306
-readpatientuser = root
-readpatientpass = 1Q2W3e4r!@#$
-readpatientname = sgj_cdm
-
-writepatienthost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-writepatientport = 3306
-writepatientuser = root
-writepatientpass = 1Q2W3e4r!@#$
-writepatientname = sgj_cdm
-
-readsgjpatientmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-readsgjpatientmysqlport = 3306
-readsgjpatientmysqluser = root
-readsgjpatientmysqlpass = 1Q2W3e4r!@#$
-readsgjpatientmysqlname = sgj_patient
-
-writesgjpatientmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
-writesgjpatientmysqlport = 3306
-writesgjpatientmysqluser = root
-writesgjpatientmysqlpass = 1Q2W3e4r!@#$
-writesgjpatientmysqlname = sgj_patient
-
-
-
-
-
-
-
-#redishost = 120.77.235.13
-#redishost = 112.74.16.180
-redishost = localhost
-redisport = 6379
-redispasswrod = syh@#$%123456!
-redisdb = 0
-
-niprocart =  83
-jms = 80
-fistula_needle_set = 81
-fistula_needle_set_16 = 82
-hemoperfusion = 85
-dialyser_sterilised = 84
-filtryzer = 79
-dialyzers = 10000
-injector = 10001
-bloodlines = 10002
-tubingHemodialysis = 10003
-package = 10004
-aliquid = 10005

controllers/inspection_api_controller.go

@@ -432,7 +432,7 @@ func (c *InspectionApiController) GetPatientInspections() {
 
 	date := ""
 	if len(inspections) > 0 {
-		date = time.Unix(dateTime, 0).Format("2006-01-02")
+		date = time.Unix(dateTime, 0).Format("2006-01-02 15:04")
 	}
 
 	c.ServeSuccessJSON(map[string]interface{}{

service/inspection_service.go

@@ -8,7 +8,13 @@ import (
 )
 
 func GetInspectionReference(orgId int64) (reference []*models.InspectionReference, err error) {
-	err = readDb.Model(&models.InspectionReference{}).Where("(org_id=0 OR org_id=?) and status=1", orgId).Order("project_id").Find(&reference).Error
+	var count int
+	err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1", orgId).Count(&count).Error
+	if count > 0 {
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=? and status=1", orgId).Order("project_id").Find(&reference).Error
+	} else {
+		err = readDb.Model(&models.InspectionReference{}).Where("org_id=0 and status=1").Order("project_id").Find(&reference).Error
+	}
 	return
 }