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

controllers/common_api_controller.go

@@ -1067,6 +1067,7 @@ func (this *CommonApiController) GetNormData() {
 	orgid := this.GetAdminUserInfo().CurrentOrgId
 	//获取系统数据
 	normdata, err := service.GetNormDataByOrgId(orgid)
+
 	//获取血压数据
 	bloodPressure, err := service.GetDefaultBloodPressure(orgid)
 	if err != nil {
@@ -1119,6 +1120,7 @@ func (this *CommonApiController) GetFirstQuarter() {
 	fmt.Println("结束日期", entime)
 	//统计数值类型的数据
 	count, err := service.GetQuarterTotalCount(orgid, statime, entime, lapseto, origin)
+	fmt.Println("countwowowowoowowowowoww", count)
 	//统计rang_type== 2
 	countwo, _ := service.GetQuarterTotalCountTwo(orgid, statime, entime, lapseto, origin)
 

controllers/mobile_api_controllers/check_weight_api_controller.go

@@ -633,7 +633,10 @@ func (c *CheckWeightApiController) SavePatientInfoDialysis() {
 				evaluation.Exposed = lastPredialysisEvaluation.Exposed                         // 外漏
 				evaluation.DialysisCount = lastPredialysisEvaluation.DialysisCount             //呼吸频次
 				evaluation.Phinholing = lastPredialysisEvaluation.Phinholing                   //针眼
-
+				evaluation.Remark = lastPredialysisEvaluation.Remark
+				if adminUserInfo.Org.Id == 10318 {
+					evaluation.Remark = "患者已确认无发热，无流行病学接触史"
+				}
 			}
 		} else {
 			evaluation.UpdatedTime = time.Now().Unix()

service/print_data_service/schedule_dialysis/print_schedule_dialysis_service.go

@@ -300,7 +300,7 @@ func GetWarehouseOutInfoPrintList(orgid int64, startime int64, endtime int64) (o
 	if endtime > 0 {
 		db = db.Where("x.ctime<=?", endtime)
 	}
-	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
+	err = db.Select("x.patient_id,x.sys_record_time,x.good_id,sum(x.count) as count,x.ctime,t.good_name,t.specification_name,t.packing_unit,t.retail_price,t.packing_price,t.buy_price").Joins("left join xt_good_information as t on t.id = x.good_id").Group("x.good_id").Scan(&out).Error
 	return out, err
 }