comparison src/kaigo/Perori/perori.go @ 43:77dd877929f5

bug fix.
author pyon@macmini
date Fri, 13 Mar 2020 18:21:08 +0900
parents c58172a59534
children b50f2a581cf8
comparison
equal deleted inserted replaced
42:c58172a59534 43:77dd877929f5
18 ) 18 )
19 19
20 var debug_log bool 20 var debug_log bool
21 21
22 // Constants 22 // Constants
23 const version = "0.3" 23 const version = "0.3a"
24 const default_dbfile = "ikenshoirai.db" 24 const default_dbfile = "ikenshoirai.db"
25 const default_csvfile = "ikenshoirai.csv" 25 const default_csvfile = "ikenshoirai.csv"
26 26
27 const tpl = ` 27 const tpl = `
28 <!DOCTYPE html> <html> 28 <!DOCTYPE html> <html>
62 62
63 </td> 63 </td>
64 <td width=80 align=center>{{.Hhsno}}</td> 64 <td width=80 align=center>{{.Hhsno}}</td>
65 </tr> 65 </tr>
66 <tr> 66 <tr>
67 <td colspan=4 style="font-family: serif; font-size: 8pt; padding-left: 10px;">{{.Biko}}</td> 67 <td colspan=4 style="font-family: serif; font-size: 8pt; padding-left: 30px;">{{.Biko}}</td>
68 </tr> 68 </tr>
69 69
70 </table> 70 </table>
71 {{end}} 71 {{end}}
72 {{end}} 72 {{end}}
140 case "09": 140 case "09":
141 buf = "証交" 141 buf = "証交"
142 } 142 }
143 s.Kubun, _, _ = transform.String(japanese.ShiftJIS.NewEncoder(), buf) 143 s.Kubun, _, _ = transform.String(japanese.ShiftJIS.NewEncoder(), buf)
144 144
145 s.Ymd = strings.Join([]string{s.Ymd[4:6], s.Ymd[6:8]}, ".") 145 s.Ymd = strings.Join([]string{s.Ymd[2:4], s.Ymd[4:6], s.Ymd[6:8]}, ".")
146 } 146 }
147 147
148 type Doctor struct { 148 type Doctor struct {
149 Id string 149 Id string
150 Name string 150 Name string
206 for _, ss := range dbdata { 206 for _, ss := range dbdata {
207 ss.Humanize() 207 ss.Humanize()
208 switch hhscnt[ss.Hhsno] { 208 switch hhscnt[ss.Hhsno] {
209 case 0: 209 case 0:
210 recentdata = append(recentdata, ss) 210 recentdata = append(recentdata, ss)
211 hhscnt[ss.Hhsno]++;
212 case 1: 211 case 1:
213 prevhash[ss.Hhsno] = PrevSinsei{ 212 prevhash[ss.Hhsno] = PrevSinsei{
214 Biko: ss.Biko, 213 Biko: ss.Biko,
215 DrId: ss.DrId, 214 DrId: ss.DrId,
216 Dr: ss.Dr + "(" + ss.Hp + ":" + ss.Senmon + ")", 215 Dr: ss.Dr + "(" + ss.Hp + ":" + ss.Senmon + ")",
217 IraiYmd: ss.IraiYmd, 216 IraiYmd: ss.IraiYmd,
218 Ymd: ss.Ymd, 217 Ymd: ss.Ymd,
219 Kubun: ss.Kubun, 218 Kubun: ss.Kubun,
220 } 219 }
221 } 220 }
221 hhscnt[ss.Hhsno]++;
222 } 222 }
223 print_debug_log(fmt.Sprintf("recentdata: n=%d", len(recentdata))) // 223 print_debug_log(fmt.Sprintf("recentdata: n=%d", len(recentdata))) //
224 224
225 doctorhash := make(map[string]Doctor) 225 doctorhash := make(map[string]Doctor)
226 hpcnt := make(map[string]int) 226 hpcnt := make(map[string]int)