Merge branch 'main' of suhaiwen/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/YkyyPrescriptionService.java

@@ -506,13 +506,15 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
            JSONArray rs = new JSONArray();
            if(res !=null){
                for (int i =0;i<res.size();i++){
                    JSONObject object = (JSONObject) res.get(i);
                    JSONObject jsonObject = new JSONObject();
                    jsonObject.put("PAT_NO",jsonObject.get("pat_no"));
                    jsonObject.put("CARD_NO",jsonObject.get("card_no"));
                    jsonObject.put("OP_DATE",jsonObject.get("op_date"));
                    jsonObject.put("CARD_STAT",jsonObject.get("card_stat"));
                    jsonObject.put("CARD_TYPE",jsonObject.get("card_type"));
                    jsonObject.put("CARD_TYPE_NAME",jsonObject.get("card_type_name"));
                    jsonObject.put("PAT_NO",object.get("pat_no"));
                    jsonObject.put("CARD_NO",object.get("card_no"));
                    jsonObject.put("OP_DATE",object.get("op_date"));
                    jsonObject.put("CARD_STAT",object.get("card_stat"));
                    jsonObject.put("CARD_TYPE",object.get("card_type"));
                    jsonObject.put("CARD_TYPE_NAME",object.get("card_type_name"));
                    rs.add(jsonObject);
                }
            }
            return rs;

svr/svr-base/src/main/java/com/yihu/jw/base/service/org/OrgTree.java

@@ -41,6 +41,7 @@ public class OrgTree extends IntegerIdentityEntity implements TreeNode {
        this.parentCode = parentCode;
        this.name = name;
        this.level = level;
    }