提交

conf/app.conf

@@ -1,5 +1,5 @@
 appname = 血透
-httpport = 9529
+httpport = 9531
 runmode = dev
 
 # 1

controllers/gobal_config_api_controller.go

@@ -1027,12 +1027,19 @@ func (this *GobalConfigApiController) ChangeOrg() {
 			}
 		}
 
+		//产寻该机构是否有收缩压和舒张压
+		pressure, err := service.GetDefaultSystolicPressure(tempOrg.Id)
+		fmt.Println(err)
+		if len(pressure) == 0 {
+			err = service.BathInsertQualityControlTwo(tempOrg.Id)
+		} else {
+			utils.ErrorLog("字段批量插入失败：%v", err)
+		}
 		major, err := service.GetInspectionMajor(tempOrg.Id)
 		if len(major) == 0 {
 			QualityeList, err := service.FindQualityByOrgId(tempOrg.Id)
 			if len(QualityeList) == 0 {
 				err = service.BatchInsertQualityControl(tempOrg.Id)
-				err = service.BathInsertQualityControlTwo(tempOrg.Id)
 			} else {
 				utils.ErrorLog("字段批量插入失败：%v", err)
 			}

controllers/mobile_api_controllers/login_api_controller.go

@@ -6,6 +6,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -168,6 +169,14 @@ func (this *LoginAPIController) LoginByPwd() {
 				FiledList = make([]*models.FiledConfig, 0)
 			}
 		}
+		//产寻该机构是否有收缩压和舒张压
+		pressure, err := service.GetDefaultSystolicPressure(org.Id)
+		fmt.Println(err)
+		if len(pressure) == 0 {
+			err = service.BathInsertQualityControlTwo(org.Id)
+		} else {
+			utils.ErrorLog("字段批量插入失败：%v", err)
+		}
 
 		//批量插入质控达标统计配置
 		major, requestErr := service.GetInspectionMajor(org.Id)
@@ -175,7 +184,6 @@ func (this *LoginAPIController) LoginByPwd() {
 			QualityeList, err := service.FindQualityByOrgId(org.Id)
 			if len(QualityeList) == 0 {
 				err = service.BatchInsertQualityControl(org.Id)
-				err = service.BathInsertQualityControlTwo(org.Id)
 			} else {
 				utils.ErrorLog("字段批量插入失败：%v", err)
 			}

controllers/new_mobile_api_controllers/common_api_controller.go

@@ -2032,3 +2032,28 @@ func (this *CommonApiController) GetMonthBloodList() {
 		})
 	}
 }
+
+func (this *CommonApiController) GetIdsListTwo() {
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	adminInfo := this.GetAdminUserInfo()
+	orgId := adminInfo.CurrentOrgId
+	patientid, _ := this.GetInt64("patientid")
+	idlist := dataBody["ids"].([]interface{})
+
+	var vlist []interface{}
+	for _, contagion := range idlist {
+		id := int64(contagion.(float64))
+		list, _ := service.GetInspectionMoninList(id, orgId, patientid)
+		vlist = append(vlist, list)
+	}
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"vlist": vlist,
+	})
+
+}

controllers/new_mobile_api_controllers/common_api_router.go

@@ -55,4 +55,5 @@ func CommonApiControllersRegisterRouters() {
 	beego.Router("/com/api/updatebloodprussre", &CommonApiController{}, "Post:UpdateBloodPrussre")
 	beego.Router("/com/api/getbloodpressurelist", &CommonApiController{}, "Get:GetBloodPressureList")
 	beego.Router("/com/api/getmonthbloodlist", &CommonApiController{}, "Get:GetMonthBloodList")
+	beego.Router("/com/api/getidslist", &CommonApiController{}, "Post:GetIdsListTwo")
 }

controllers/new_mobile_api_controllers/forget_password_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
 	"io/ioutil"
 	"net/http"
@@ -180,12 +181,19 @@ func (this *ForgetPwdController) ModifyPassword() {
 			}
 
 			if org.Id > 0 {
+				//产寻该机构是否有收缩压和舒张压
+				pressure, err := service.GetDefaultSystolicPressure(org.Id)
+				fmt.Println(err)
+				if len(pressure) == 0 {
+					err = service.BathInsertQualityControlTwo(org.Id)
+				} else {
+					utils.ErrorLog("字段批量插入失败：%v", err)
+				}
 				major, requestErr := service.GetInspectionMajor(org.Id)
 				if len(major) == 0 {
 					QualityeList, err := service.FindQualityByOrgId(org.Id)
 					if len(QualityeList) == 0 {
 						err = service.BatchInsertQualityControl(org.Id)
-						err = service.BathInsertQualityControlTwo(org.Id)
 					} else {
 						utils.ErrorLog("字段批量插入失败：%v", err)
 					}

controllers/new_mobile_api_controllers/home_api_controller.go

@@ -7,6 +7,7 @@ import (
 	"XT_New/service"
 	"XT_New/utils"
 	"encoding/json"
+	"fmt"
 	"github.com/astaxie/beego"
 	"io/ioutil"
 	"net/http"
@@ -233,12 +234,19 @@ func (this *HomeController) ChangeOrg() {
 			}
 
 			if org.Id > 0 {
+				//产寻该机构是否有收缩压和舒张压
+				pressure, err := service.GetDefaultSystolicPressure(org.Id)
+				fmt.Println(err)
+				if len(pressure) == 0 {
+					err = service.BathInsertQualityControlTwo(org.Id)
+				} else {
+					utils.ErrorLog("字段批量插入失败：%v", err)
+				}
 				major, err := service.GetInspectionMajor(org.Id)
 				if len(major) == 0 {
 					QualityeList, err := service.FindQualityByOrgId(org.Id)
 					if len(QualityeList) == 0 {
 						err = service.BatchInsertQualityControl(org.Id)
-						err = service.BathInsertQualityControlTwo(org.Id)
 					} else {
 						utils.ErrorLog("字段批量插入失败：%v", err)
 					}

controllers/new_mobile_api_controllers/new_common_api_controller.go

@@ -5,6 +5,7 @@ import (
 	"XT_New/enums"
 	"XT_New/service"
 	"XT_New/utils"
+	"encoding/json"
 	"fmt"
 	"time"
 )
@@ -1956,3 +1957,27 @@ func (this *NewCommonApiController) GetSystolicBloodStand() {
 		"bloodPressure": bloodPressure,
 	})
 }
+
+func (this *NewCommonApiController) GetMobileIdsList() {
+	dataBody := make(map[string]interface{}, 0)
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &dataBody)
+	fmt.Println(err)
+	admin := this.GetMobileAdminUserInfo()
+	orgId := admin.Org.Id
+	patientid, _ := this.GetInt64("patientid")
+	idlist := dataBody["ids"].([]interface{})
+
+	var vlist []interface{}
+	for _, contagion := range idlist {
+		id := int64(contagion.(float64))
+		list, _ := service.GetInspectionMoninList(id, orgId, patientid)
+		vlist = append(vlist, list)
+	}
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeSystemError)
+		return
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"vlist": vlist,
+	})
+}

controllers/new_mobile_api_controllers/new_common_api_router.go

@@ -40,4 +40,5 @@ func NewCommonApiControllersRegisterRouters() {
 	beego.Router("/m/api/gettargetnostanddetail", &NewCommonApiController{}, "Get:GetTargetNoStandDetail")
 	beego.Router("/m/api/gettargestanddetail", &NewCommonApiController{}, "Get:GetTargetStandDetail")
 	beego.Router("/m/api/getsystolicbloodstand", &NewCommonApiController{}, "Get:GetSystolicBloodStand")
+	beego.Router("/m/api/getmobileidslist", &NewCommonApiController{}, "post:GetMobileIdsList")
 }

controllers/new_mobile_api_controllers/new_login_api_controller.go

@@ -296,12 +296,20 @@ func (this *NewLoginApiController) LoginByCs() {
 			}
 
 			if org.Id > 0 {
+				//产寻该机构是否有收缩压和舒张压
+				pressure, err := service.GetDefaultSystolicPressure(org.Id)
+				fmt.Println(err)
+				if len(pressure) == 0 {
+					err = service.BathInsertQualityControlTwo(org.Id)
+				} else {
+					utils.ErrorLog("字段批量插入失败：%v", err)
+				}
 				major, requestErr := service.GetInspectionMajor(org.Id)
 				if len(major) == 0 {
 					QualityeList, err := service.FindQualityByOrgId(org.Id)
 					if len(QualityeList) == 0 {
 						err = service.BatchInsertQualityControl(org.Id)
-						err = service.BathInsertQualityControlTwo(org.Id)
+
 					} else {
 						utils.ErrorLog("字段批量插入失败0：%v", err)
 					}

controllers/verify_login_controller.go

@@ -157,13 +157,19 @@ func (this *VerifyUserLoginAPIController) VerifyToken() {
 					utils.ErrorLog("字段批量插入失败：%v", err)
 				}
 			}
-
+			//产寻该机构是否有收缩压和舒张压
+			pressure, err := service.GetDefaultSystolicPressure(curOrg.Id)
+			fmt.Println(err)
+			if len(pressure) == 0 {
+				err = service.BathInsertQualityControlTwo(curOrg.Id)
+			} else {
+				utils.ErrorLog("字段批量插入失败：%v", err)
+			}
 			major, err := service.GetInspectionMajor(curOrg.Id)
 			if len(major) == 0 {
 				QualityeList, err := service.FindQualityByOrgId(curOrg.Id)
 				if len(QualityeList) == 0 {
 					err = service.BatchInsertQualityControl(curOrg.Id)
-					err = service.BathInsertQualityControlTwo(curOrg.Id)
 				} else {
 					utils.ErrorLog("字段批量插入失败：%v", err)
 				}

service/common_service.go

@@ -3220,3 +3220,9 @@ func GetDiastolicStand(orgid int64, startime int64, endtime int64) (record []*mo
 	err = db.Select("x.id,x.systolic_blood_pressure,x.diastolic_blood_pressure,x.patient_id,x.monitoring_date,s.name").Joins("left join xt_patients as s on s.id = x.patient_id").Where("x.user_org_id = ? and x.monitoring_date >=? and x.monitoring_date<=? and x.status = 1 and (x.systolic_blood_pressure <> 0 or x.diastolic_blood_pressure)", orgid, startime, endtime).Group("x.monitoring_date,x.patient_id").Scan(&record).Error
 	return record, err
 }
+
+func GetInspectionMoninList(id int64, orgid int64, patientid int64) (models.XtInspection, error) {
+	inspection := models.XtInspection{}
+	err = XTReadDB().Model(&inspection).Where("item_id=? and org_id = ? and status = 1 and patient_id = ?", id, orgid, patientid).Last(&inspection).Error
+	return inspection, err
+}

service/data.go

@@ -173,7 +173,13 @@ func FindFiledByOrgId(org_id int64) (filedConfig []*models.FiledConfig, err erro
 
 func FindQualityByOrgId(orgid int64) (xtquality []*models.XtQualityControlStandard, err error) {
 
-	err = readDb.Model(&models.XtQualityControlStandard{}).Where("user_org_id =? and status =1", orgid).Find(&xtquality).Error
+	err = readDb.Model(&models.XtQualityControlStandard{}).Where("user_org_id =? and status =1 and is_status = 1", orgid).Find(&xtquality).Error
+	return
+}
+
+func GetDefaultSystolicPressure(orgid int64) (xtquality []*models.XtQualityControlStandard, err error) {
+
+	err = readDb.Model(&models.XtQualityControlStandard{}).Where("user_org_id = ? and status = 1 and is_status =0", orgid).Find(&xtquality).Error
 	return
 }