y595705120 3 years ago
parent
commit
ea06700ca7

+ 1 - 1
cmd/main.go

@@ -9,7 +9,7 @@ func main() {
 	ordonnance := model.Ordonnance{
 		OrdonnanceId: 2,
 		Counter:      5,
-		PrintDate:    "2021-11-02",
+		PrintDate:    "2021-11-02 10:30:00",
 		Nickname:     "吕俊喜",
 		Organ:        "鼓楼社区",
 	}

+ 12 - 15
common/util/ordonnance.go

@@ -34,33 +34,30 @@ func MakeImg(ordonnance model.Ordonnance) string {
 	url := fmt.Sprintf("https://sm.hqedust.com/ordonnance/#/ordonnance/%d", ordonnance.OrdonnanceId)
 	qrcodeData, _ := qrcode.Encode(url, qrcode.Medium, 100)
 	qrImg, _ := png.Decode(bytes.NewReader(qrcodeData))
-	offset := image.Pt(10, 10)
+	offset := image.Pt(90, 10)
 	draw.Draw(m, qrImg.Bounds().Add(offset), qrImg, image.ZP, draw.Over)
 
 	f.SetFontSize(12)
-	w, h := 120, 30
+	w, h := 20, 40
 	f.DrawString("同春煎药", freetype.Pt(w, h))
 
-	w, h = 120, 50
+	w, h = 20, 70
 	f.DrawString("冷藏保管", freetype.Pt(w, h))
 
-	w, h = 120, 80
-	f.DrawString("时间:", freetype.Pt(w, h))
-
-	w, h = 120, 100
-	f.DrawString(ordonnance.PrintDate, freetype.Pt(w, h))
-
-	w, h = 20, 130
+	w, h = 20, 120
 	f.DrawString("To:", freetype.Pt(w, h))
 
-	w, h = 20, 150
-	f.DrawString("姓名:  "+ordonnance.Nickname, freetype.Pt(w, h))
+	w, h = 20, 140
+	f.DrawString("姓  名:  "+ordonnance.Nickname, freetype.Pt(w, h))
 
-	w, h = 120, 150
+	w, h = 120, 140
 	f.DrawString(fmt.Sprintf("数量:  %d 贴", ordonnance.Counter), freetype.Pt(w, h))
 
-	w, h = 20, 170
-	f.DrawString("地址:  "+ordonnance.Organ, freetype.Pt(w, h))
+	w, h = 20, 160
+	f.DrawString("地  址:  "+ordonnance.Organ, freetype.Pt(w, h))
+
+	w, h = 20, 180
+	f.DrawString("煎药时间:  "+ordonnance.PrintDate[0:16], freetype.Pt(w, h))
 
 	filename := time.Now().Format("tempdir/20060102150405.jpg")
 	myfile, _ := os.Create(filename)

BIN
tempdir/20211102220731.jpg


BIN
tempdir/20211102220941.jpg


BIN
tempdir/20211102221005.jpg


BIN
tempdir/20211102221037.jpg


BIN
tempdir/20211102221134.jpg


BIN
tempdir/20211104203215.jpg


BIN
tempdir/20211104203359.jpg


BIN
tempdir/20211104203555.jpg


BIN
tempdir/20211104203614.jpg


BIN
tempdir/20211104203651.jpg