Merge branch '20230223_xt_api_new_branch' of http://git.shengws.com/csx/XT_New into 20230223_xt_api_new_branch

controllers/his_api_controller.go

@@ -26,6 +26,7 @@ type HisApiController struct {
 }
 
 func HisManagerApiRegistRouters() {
+	beego.Router("/test/net", &HisApiController{}, "get:TestNet")
 
 	beego.Router("/api/hispatient/list", &HisApiController{}, "get:GetHisPatientList")
 	beego.Router("/api/hispatient/get", &HisApiController{}, "get:GetHisPatientInfo")
@@ -122,6 +123,12 @@ func HisManagerApiRegistRouters() {
 
 }
 
+func (c *HisApiController) TestNet() {
+	c.ServeSuccessJSON(map[string]interface{}{
+		"msg": "成功",
+	})
+}
+
 func (c *HisApiController) CheckHisPatient() {
 	record_date := c.GetString("record_date")
 	patient_id, _ := c.GetInt64("patient_id")
@@ -4265,11 +4272,11 @@ func (c *HisApiController) CreateHisPrescription() {
 								keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
 								redis.Set(keySeven, "", time.Second)
 								var randNum int
-								randNum = rand.Intn(10000) + 1000
-								timestamp := time.Now().Unix()
-								tempTime := time.Unix(timestamp, 0)
-								timeFormat := tempTime.Format("20060102150405")
-								s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
+								randNum = rand.Intn(1000) + 1000
+								//timestamp := time.Now().Unix()
+								//tempTime := time.Unix(timestamp, 0)
+								//timeFormat := tempTime.Format("20060102150405")
+								s.FeedetlSn = strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
 
 								//赤峰
 								if adminInfo.CurrentOrgId == 10265 || adminInfo.CurrentOrgId == 10489 {
@@ -5438,11 +5445,8 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								service.CreateNewHisProjectTwo(&p, tx)
 								var randNum int
-								randNum = rand.Intn(10000) + 1000
-								timestamp := time.Now().Unix()
-								tempTime := time.Unix(timestamp, 0)
-								timeFormat := tempTime.Format("20060102150405")
-								p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
+								randNum = rand.Intn(1000) + 1000
+								p.FeedetlSn = strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
 
 								goodBase, _ := service.GetBaseGoodById(p.ProjectId, p.UserOrgId)
 
@@ -5795,11 +5799,11 @@ func (c *HisApiController) CreateHisPrescription() {
 								keySeven := "scheduals_" + record_date + "_" + strconv.FormatInt(adminInfo.CurrentOrgId, 10)
 								redis.Set(keySeven, "", time.Second)
 								var randNum int
-								randNum = rand.Intn(10000) + 1000
-								timestamp := time.Now().Unix()
-								tempTime := time.Unix(timestamp, 0)
-								timeFormat := tempTime.Format("20060102150405")
-								s.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
+								randNum = rand.Intn(1000) + 1000
+								//timestamp := time.Now().Unix()
+								//tempTime := time.Unix(timestamp, 0)
+								//timeFormat := tempTime.Format("20060102150405")
+								s.FeedetlSn = strconv.FormatInt(int64(randNum), 10) + "-" + "1" + "-" + strconv.FormatInt(s.ID, 10)
 								service.CreateHisDoctorAdvice(&s)
 								keySix := strconv.FormatInt(adminInfo.CurrentOrgId, 10) + ":" + strconv.FormatInt(theTime.Unix(), 10) + ":his_advices_list_all"
 								redis.Set(keySix, "", time.Second)
@@ -5903,11 +5907,9 @@ func (c *HisApiController) CreateHisPrescription() {
 
 								projectList = append(projectList, p)
 								var randNum int
-								randNum = rand.Intn(10000) + 1000
-								timestamp := time.Now().Unix()
-								tempTime := time.Unix(timestamp, 0)
-								timeFormat := tempTime.Format("20060102150405")
-								p.FeedetlSn = timeFormat + strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
+								randNum = rand.Intn(1000) + 1000
+
+								p.FeedetlSn = strconv.FormatInt(int64(randNum), 10) + "-" + "2" + "-" + strconv.FormatInt(p.ID, 10)
 
 								if p.Type == 2 { //因为项目和耗材的基础库存在id相同的情况，所以需要根据该字段来判断，type为2的话为从项目开出来的
 									//新增或者编辑项目，修改对应的标签数据

service/statistics_service/index_evaluation_service.go

@@ -1966,6 +1966,7 @@ func FindOrgQualityControlStandardInspectionReferenceById(user_org_id int64, pro
 func FindOrgInspectionCount(user_org_id int64) (count int64, err error) {
 	db := service.XTReadDB()
 	err = db.Model(&models.InspectionReference{}).Where("status = 1 AND org_id = ?", user_org_id).Count(&count).Error
+
 	return
 }