基卫--获取档案类型列表接口

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/archives/PatientRecordService.java

@@ -139,12 +139,28 @@ public class PatientRecordService {
    /**
     * 基卫通过event获取档案类型列表
     */
    public List<Map<String,Object>> getEventCatalog(String strEvent) throws Exception
    public List<Map<String,String>> getEventCatalog(String patientCode,String strEvent) throws Exception
    {
        List<Map<String,Object>> re = new ArrayList<>();
        //获取患者
        Patient patient = patientDao.findByCode(patientCode);
        List<Map<String,String>> re = new ArrayList<>();
        String response = jwSmjkService.getEventCatalog(strEvent);   //【基卫接口】
        String response = jwSmjkService.getEventCatalog(patient.getSsc(),strEvent);   //【基卫接口】
        JSONObject json = new JSONObject(response);
        JSONArray array = json.getJSONArray("RecordList");
        if(array!=null && array.length()>0)
        {
            for(int i=0;i<array.length();i++)
            {
                JSONObject item = array.getJSONObject(i);
                Map<String,String> map = new HashMap<>();
                map.put("catalog",item.optString("CATALOG_CODE"));
                map.put("title",item.optString("TITLE"));
                map.put("serial",item.optString("SERIAL"));
                re.add(map);
            }
        }
        return re;
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwSmjkService.java

@@ -100,7 +100,7 @@ public class JwSmjkService {
    /**
     * 通过event获取档案类型列表
     */
    public String getEventCatalog(String strEvent)
    public String getEventCatalog(String strSSID,String strEvent)
    {
        if(SystemConf.getInstance().getEhrUsed())     //演示环境
        {
@@ -111,6 +111,7 @@ public class JwSmjkService {
                String url = jwUrl + "/third/smjk/EventCatalog";
                List<NameValuePair> params = new ArrayList<>();
                params.add(new BasicNameValuePair("strSSID", strSSID));
                params.add(new BasicNameValuePair("strEvent", strEvent));
                String response = HttpClientUtil.post(url, params, "UTF-8");

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/archives/PatientArchivesController.java

@@ -59,10 +59,10 @@ public class PatientArchivesController extends BaseController {
                                @RequestParam(value="event",required = true) String event,
                                @ApiParam(name="catalog",value="档案类型",defaultValue = "")
                                @RequestParam(value="catalog",required = true) String catalog,
                                @ApiParam(name="strSerial",value="该类别顺序号，默认填1",defaultValue = "1")
                                @RequestParam(value="strSerial",required = true) String strSerial) {
                                @ApiParam(name="serial",value="该类别顺序号，默认填1",defaultValue = "1")
                                @RequestParam(value="serial",required = true) String serial) {
        try {
            String result = patientRecordService.getHealthData(getUID(), event, catalog, strSerial);
            String result = patientRecordService.getHealthData(getUID(), event, catalog, serial);
            return write(200, "获取健康档案详情成功！", "data", result);
        } catch (Exception e) {
@@ -77,7 +77,7 @@ public class PatientArchivesController extends BaseController {
    public String getEventCatalog(@ApiParam(name="event",value="事件ID",defaultValue = "")
                                @RequestParam(value="event",required = true) String event) {
        try {
            List<Map<String,Object>> result = patientRecordService.getEventCatalog(event);
            List<Map<String,String>> result = patientRecordService.getEventCatalog(getUID(),event);
            return write(200, "通过事件号获取档案类型列表成功！", "data", result);
        } catch (Exception e) {