Merge branch 'master' of http://git.shengws.com/csx/gdyb

controllers/zh/zh_his_api_controller.go

 		}
 
 		if res.Infcode == 0 {
+			var insutypes []string
+			var insutype string
+			var is390 int = 0
+			var is310 int = 0
+			for _, item := range res.Output.Iinfo {
+				if (item.Insutype == "390" && item.PsnInsuStas == "1") || (item.Insutype == "310" && item.PsnInsuStas == "1") {
+					insutypes = append(insutypes, item.Insutype)
+				}
+			}
+			if len(insutypes) == 1 {
+				insutype = insutypes[0]
+			} else {
+				for _, i := range insutypes {
+					if i == "390" {
+						is390 = 1
+					}
+
+					if i == "310" {
+						is310 = 1
+					}
+				}
+			}
+			if is390 == 1 {
+				insutype = "390"
+			}
+			if is310 == 1 {
+				insutype = "310"
+			}
+			if len(insutypes) == 0 {
+				insutype = "310"
+			}
+
 			patient, err := service.GetPatientByIDCard(res.Output.Baseinfo.Certno, c.GetAdminUserInfo().CurrentOrgId)
 			if err == gorm.ErrRecordNotFound {
 				c.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNoPateintException)
 					}
 					service.CreateHisPsn(psn)
 					c.ServeSuccessJSON(map[string]interface{}{
-						"patient": patient,
-						"number":  basNumber,
-						"info":    res,
+						"patient":  patient,
+						"number":   basNumber,
+						"info":     res,
+						"insutype": insutype,
 					})
 				} else {
 					Iinfos, _ := json.Marshal(res.Output.Iinfo)
 					}
 					service.CreateHisPsn(psn)
 					c.ServeSuccessJSON(map[string]interface{}{
-						"patient": patient,
-						"number":  token,
-						"info":    res,
+						"patient":  patient,
+						"number":   token,
+						"info":     res,
+						"insutype": insutype,
 					})
 				}
 			}